aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cscd.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-18 12:29:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-18 12:29:31 +0100
commit4b7c81c3e059ae08e4aa74222de1762342ef8abf (patch)
tree86f804f2006b9c32d01d291bb2a20ff3fe56d542 /libavcodec/cscd.c
parent2220f13d8227bf769aec3a699b34b1025f976c8e (diff)
parent870a0c669e536d56c6325d84f65e34c53792398e (diff)
downloadffmpeg-4b7c81c3e059ae08e4aa74222de1762342ef8abf.tar.gz
Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'
* commit '870a0c669e536d56c6325d84f65e34c53792398e': build: The libopencore-amrnb encoder depends on audio_frame_queue Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cscd.c')
0 files changed, 0 insertions, 0 deletions