ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20526f2e2f58cb226e9891aec7d7e438a7ddb6d2
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
