aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g726.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-22 13:50:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-22 13:51:05 +0200
commit9e552b65127aa51bf60726a38fb086ddaca74fdf (patch)
tree01d330a36fbaf4c995adb003c707fc37bca5ac87 /libavcodec/g726.c
parent506ad68d87f967640519a4d568c9236d53642a9a (diff)
parent68b100871961c3e6450871367630e5bf830f6cfd (diff)
downloadffmpeg-9e552b65127aa51bf60726a38fb086ddaca74fdf.tar.gz
Merge remote-tracking branch 'qatar/release/0.8' into release/0.10
* qatar/release/0.8: adpcm: Unbreak ima-dk4 ac3dec: validate channel output mode against channel count dca: Respect the current limits in the downmixing capabilities Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g726.c')
0 files changed, 0 insertions, 0 deletions