aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/sdr2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-07-03 03:40:22 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-07-03 03:40:22 +0200
commita8ab64d2f70029a87467f75d1412bf6d13664b64 (patch)
tree1792a7f59dabf8f277d4f6db49d6a52bf0464d88 /libavformat/sdr2.c
parente15e78f391abf4e037352cd783f6fa3c6b843d94 (diff)
parent910247f1720c6aae422723c05dac6d0b19f20bec (diff)
downloadffmpeg-a8ab64d2f70029a87467f75d1412bf6d13664b64.tar.gz
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>
Diffstat (limited to 'libavformat/sdr2.c')
0 files changed, 0 insertions, 0 deletions