aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/audio_fifo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-19 13:33:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-19 13:33:44 +0200
commitedd110ee4526849da487bb6be9c63fc77cb5a65a (patch)
tree4c0b9bd163f24be2ede535cc91dc6382bc006b24 /libavutil/audio_fifo.c
parent247f4d1f181c2801b8321a7ddb88818dc4861155 (diff)
parentbd2ab27c488ae92c7820efe11d4f53d84e94d58e (diff)
downloadffmpeg-edd110ee4526849da487bb6be9c63fc77cb5a65a.tar.gz
Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'
* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e': avconv: use read_file() for reading the 2pass stats Conflicts: cmdutils.c cmdutils.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil/audio_fifo.c')
0 files changed, 0 insertions, 0 deletions