aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libcelt_dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-28 10:47:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-28 10:47:43 +0200
commit945c7e399af230d9fde6df641f13a11dfc5d4954 (patch)
treec88eba40bf04ced8c03fc6a7c5ae98e8ac2fa921 /libavcodec/libcelt_dec.c
parent3e0c78bac63c213649c3e8c2fa49e9f3c9848d5a (diff)
parent38e15df1489d86c016515223ee693e7d0326c56a (diff)
downloadffmpeg-945c7e399af230d9fde6df641f13a11dfc5d4954.tar.gz
Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'
* commit '38e15df1489d86c016515223ee693e7d0326c56a': avframe: note that linesize is not the usable data size Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libcelt_dec.c')
0 files changed, 0 insertions, 0 deletions