Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:40:22 +0000 (03:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 01:40:22 +0000 (03:40 +0200)
commita8ab64d2f70029a87467f75d1412bf6d13664b64
tree1792a7f59dabf8f277d4f6db49d6a52bf0464d88
parente15e78f391abf4e037352cd783f6fa3c6b843d94
parent910247f1720c6aae422723c05dac6d0b19f20bec
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@gmx.at>
libavcodec/avcodec.h
libavcodec/dnxhdenc.c
libavcodec/dnxhdenc.h
libavcodec/internal.h
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/options_table.h
libavcodec/version.h