ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri May 22 
20:38:07 2015 +0200| [d5227ceff13e52eddf1fd02e0042ebc9aa628791] | committer: 
Michael Niedermayer

Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'

* commit '9c1db92ad372d4cd69e0490e691c56e4097cb193':
  mpegvideo: Drop err_recognition

Conflicts:
        libavcodec/h263dec.c
        libavcodec/ituh263dec.c
        libavcodec/mpeg4video.h
        libavcodec/mpeg4videodec.c
        libavcodec/msmpeg4dec.c

Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5227ceff13e52eddf1fd02e0042ebc9aa628791
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to