[FFmpeg-cvslog] Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'
Michael Niedermayer
git at videolan.org
Mon Jul 20 22:01:43 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 21:53:09 2015 +0200| [033144c0d13c6e83e128f1cd5e1d460be94bace0] | committer: Michael Niedermayer
Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'
* commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919':
svq1enc: Do not entangle coded_frame
Conflicts:
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=033144c0d13c6e83e128f1cd5e1d460be94bace0
---
More information about the ffmpeg-cvslog
mailing list