ffmpeg | branch: master | Michael Niedermayer <michae...@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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8ab64d2f70029a87467f75d1412bf6d13664b64
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
