aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g729.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-16 13:13:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-16 13:13:42 +0100
commitbb29ee62e9ef30c26988f386e7c3be7affe836f9 (patch)
treeb09b40010a8fd2096190cfcf34c7682fc55b63d8 /libavcodec/g729.h
parent1c5b8b916d3d068aef9b8d0842d9258eb6cb978d (diff)
parentd2a25c4032ce6ceabb0f51b5c1e6ca865395a793 (diff)
downloadffmpeg-bb29ee62e9ef30c26988f386e7c3be7affe836f9.tar.gz
Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'
* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793': get_buffer(): do not initialize the data. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g729.h')
0 files changed, 0 insertions, 0 deletions