aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/audioconvert.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-17 16:11:53 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-17 16:11:53 +0100
commit206c06d96f68be737202c0fb554c13fb8b261133 (patch)
treec1e652397d09f00682e93e9f9d7f37e106bae5a6 /libavutil/audioconvert.h
parent58770db2ae67d9b4b6adcf2b15951f9608442051 (diff)
parent2ce8bca51f7264b47027f69d50dd8e49aa2fd683 (diff)
downloadffmpeg-206c06d96f68be737202c0fb554c13fb8b261133.tar.gz
Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'
* commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683': avconv: print a warning when falling back to default 25fps Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/audioconvert.h')
0 files changed, 0 insertions, 0 deletions