[FFmpeg-cvslog] Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'

Michael Niedermayer git at videolan.org
Fri Jul 3 03:50:44 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  3 03:40:22 2015 +0200| [a8ab64d2f70029a87467f75d1412bf6d13664b64] | committer: Michael Niedermayer

Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'

* commit '910247f1720c6aae422723c05dac6d0b19f20bec':
  lavc: Deprecate avctx.{inter,intra}_quant_bias

Conflicts:
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8ab64d2f70029a87467f75d1412bf6d13664b64
---





More information about the ffmpeg-cvslog mailing list