[FFmpeg-cvslog] Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'
Michael Niedermayer
git at videolan.org
Mon Jun 15 22:29:30 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 15 22:11:43 2015 +0200| [20526f2e2f58cb226e9891aec7d7e438a7ddb6d2] | committer: Michael Niedermayer
Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'
* commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26':
lavc: Clarify the behaviour of dimension and format context fields
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20526f2e2f58cb226e9891aec7d7e438a7ddb6d2
---
More information about the ffmpeg-cvslog
mailing list