[FFmpeg-cvslog] Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'
Michael Niedermayer
git at videolan.org
Mon Jul 20 22:48:22 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jul 20 22:35:38 2015 +0200| [5cc3faf6198b881e2f0aa65ac72aa2671e5b015b] | committer: Michael Niedermayer
Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'
* commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b':
ffv1enc: Use input frame to set SAR and interlacing
Conflicts:
libavcodec/ffv1enc.c
No change as the removed coded_frame uses where not in the code anymore
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5cc3faf6198b881e2f0aa65ac72aa2671e5b015b
---
More information about the ffmpeg-cvslog
mailing list