Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 10:04:18 +0000 (12:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 May 2013 10:15:56 +0000 (12:15 +0200)
commit029353e427dab092444008085ac330009a1707bd
tree8d2bbfcd2e955e8745c6b544f4e14730cbb98e1b
parentcf6ed1f1293c2dd69b76d9246a916925b58b7bbf
parente9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'

* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_parser.c
tests/Makefile
tests/fate/lossless-audio.mak