-
Michael Niedermayer authored
* commit 'e41ff421': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
92e10e34
* commit 'e41ff421': mpeg4videodec: move use_intra_dc_vlc from MpegEncContext to Mpeg4DecContext Conflicts: libavcodec/mpeg4videodec.c Merged-by:Michael Niedermayer <michaelni@gmx.at>