[FFmpeg-cvslog] Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'
Michael Niedermayer
git at videolan.org
Fri May 24 12:00:35 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 24 11:51:58 2013 +0200| [0c25c398dab033cda0e28ca074505e47d7480d76] | committer: Michael Niedermayer
Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'
* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
avcodec: Add picture structure information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0c25c398dab033cda0e28ca074505e47d7480d76
---
More information about the ffmpeg-cvslog
mailing list