Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 19:34:59 +0000 (21:34 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 19:34:59 +0000 (21:34 +0200)
commitddd86e4747f2e33bf6b6e0926e158c8998e05eb3
tree901996083e1c3716b6d48a4a68ef07e0f3e188e0
parent547848f71184274f25b23e1bdacfffe80f1fdf34
parentab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7
Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'

* commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7':
  mpegvideo_parser: export pixel format and dimensions

Conflicts:
libavcodec/mpegvideo_parser.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/mpegvideo_parser.c