-
Michael Niedermayer authored
* commit 'c45eeb2d': mpegvideo: replace assert about interlaced EC with debug av_log() Conflicts: libavcodec/mpegvideo.c See: c88bbc01Merged-by: Michael Niedermayer <michaelni@gmx.at>
9222a176
* commit 'c45eeb2d': mpegvideo: replace assert about interlaced EC with debug av_log() Conflicts: libavcodec/mpegvideo.c See: c88bbc01Merged-by: Michael Niedermayer <michaelni@gmx.at>