Merge commit '13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea'
* commit '13e4f2c7f7857feb6885f0c2ea8c9ddf438f46ea': mpeg4videodec: Remove useless messages Conflicts: libavcodec/mpeg4videodec.c not merged, the messages have been an important aid for debugging in old mpeg4 and help understanding bug reports Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4103172376