aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/twinvqdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-20 18:55:22 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-20 18:55:22 +0100
commiteef74b2e97139d8422f76a0f8241aed17fc0617d (patch)
treea3b2851c96fbe1cd527f1444c9bcdd47cfe99e61 /libavcodec/twinvqdec.c
parent8001e9f7d17e90b4b0898ba64e3b8bbd716c513c (diff)
parent93c553c71ef48550ff7c2aa7b5712a7e01f1999f (diff)
downloadffmpeg-eef74b2e97139d8422f76a0f8241aed17fc0617d.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavc: deprecate CODEC_FLAG_EMU_EDGE and avcodec_get_edge_width(). Conflicts: doc/APIchanges libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/twinvqdec.c')
0 files changed, 0 insertions, 0 deletions