[FFmpeg-cvslog] Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'
Michael Niedermayer
git at videolan.org
Sun Jun 21 21:16:39 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 21 21:07:10 2015 +0200| [30e9ebb14f197bbc3fcbde467da39d1a79ac8d52] | committer: Michael Niedermayer
Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'
* commit '05bf3f54e6078716f6267df530bf1d474ca3d606':
libvpx: Do not set vp8 only parameters when encoding in vp9
Conflicts:
libavcodec/libvpxenc.c
See: 238ec505e263e7d0363798a05c1c28f494a6300a
See: ae330070ee8b985abb011835502b03baacfbb18c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30e9ebb14f197bbc3fcbde467da39d1a79ac8d52
---
More information about the ffmpeg-cvslog
mailing list