Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 10:58:52 +0000 (12:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 11:03:00 +0000 (13:03 +0200)
commit9fd5e75bdf62c5aa19163a6033b361dcc8e31238
tree78e6c625741181347876ccda1072f6d7bd85afec
parent6fc58a8cb6707087e31fa8396a9e73c6f7595638
parentaccde1bd8756936e1757b42fc9bad2eb5d192f8a
Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'

* commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a':
  vc1_parser: Set field_order.
  mpegvideo_parser: Set field_order.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo_parser.c
libavcodec/vc1_parser.c