aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/audio_mix.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-23 12:56:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-23 12:56:55 +0200
commitcc61ef0479f07ddb9f22cbf3fa9ca28d6fd0cf72 (patch)
treec65062a711988b3c44794d888daf92773cf8b59e /libavresample/audio_mix.c
parentd894e64acca98b091d503a8f61410c02c8e98b20 (diff)
parent42cc6cefd315c1556e2a52f7ebe2f766ec82b790 (diff)
downloadffmpeg-cc61ef0479f07ddb9f22cbf3fa9ca28d6fd0cf72.tar.gz
Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'
* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790': avconv: report the error for codec open failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions