-
Michael Niedermayer authored
* commit 'ab05ed4c': mpegvideo_parser: export pixel format and dimensions Conflicts: libavcodec/mpegvideo_parser.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
ddd86e47
* commit 'ab05ed4c': mpegvideo_parser: export pixel format and dimensions Conflicts: libavcodec/mpegvideo_parser.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>