Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 18:38:07 +0000 (20:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 18:38:42 +0000 (20:38 +0200)
commitd5227ceff13e52eddf1fd02e0042ebc9aa628791
treeca15b06625ef047c64caab1069ee39643df4fa8a
parentd9b264bc73723ce538d72f28a4a8fb4f85af7eca
parent9c1db92ad372d4cd69e0490e691c56e4097cb193
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 <michaelni@gmx.at>
libavcodec/h263dec.c
libavcodec/ituh263dec.c
libavcodec/mpeg4video.h
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msmpeg4dec.c