aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/fate/idroq-video-encode
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-30 03:32:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-30 04:38:32 +0200
commit16e25ef34b375dbc6789b6b0da7d077c1dcefe88 (patch)
treecd2b27d2a0c185192c1202f0aaa7979c760ed6a1 /tests/ref/fate/idroq-video-encode
parentb0387edd5e766b1032f946d6cdb35b765bb45435 (diff)
parentc9cc76290f8139a012a12efe7e581276b8bd8dff (diff)
downloadffmpeg-16e25ef34b375dbc6789b6b0da7d077c1dcefe88.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: avconv: extend -r to work on any input stream. doc/avconv: expand documentation for the -s option. avconv: don't print filters inserted by avconv in stream mappings. avconv: merge configuration code for complex and simple filters avconv: split configuring input filters out of configure_complex_filter Conflicts: configure doc/ffmpeg.texi ffmpeg.c tests/ref/fate/idroq-video-encode Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/idroq-video-encode')
-rw-r--r--tests/ref/fate/idroq-video-encode2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/fate/idroq-video-encode b/tests/ref/fate/idroq-video-encode
index 4c89de8b63..bfffb090c2 100644
--- a/tests/ref/fate/idroq-video-encode
+++ b/tests/ref/fate/idroq-video-encode
@@ -1 +1 @@
-75df9ce475c1b185fc3dbc219596edd3
+736168b00f6b79f472a57bf47b587c8c