[FFmpeg-cvslog] Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
Michael Niedermayer
git at videolan.org
Fri May 24 12:24:18 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 24 12:04:18 2013 +0200| [029353e427dab092444008085ac330009a1707bd] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=029353e427dab092444008085ac330009a1707bd
---
More information about the ffmpeg-cvslog
mailing list