* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58': mpeg4video_parser: K&R formatting cosmetics Conflicts: libavcodec/mpeg4video_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
4.7 KiB
4.7 KiB