diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:15:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 21:15:21 +0100 |
| commit | c51fcdf0f62e3be181fa9a10748c819eea1aaf9e (patch) | |
| tree | e82847818c8a41535e2158eaf7bd30630763598e | |
| parent | 771919e11fcdf6fb518c04d55b83fb3e50c35a58 (diff) | |
| parent | db2d65ce1ed13ea9a530b1934963a16c3e8fa460 (diff) | |
| download | ffmpeg-c51fcdf0f62e3be181fa9a10748c819eea1aaf9e.tar.gz | |
Merge commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460'
* commit 'db2d65ce1ed13ea9a530b1934963a16c3e8fa460':
avconv: fix a typo
FATE: replace -vb with -b:v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tests/fate/vcodec.mak | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index b1310a5c86..fbbe4a44d9 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -124,7 +124,7 @@ $(FATE_MPEG2:%=fate-vsynth\%-%): FMT = mpeg2video $(FATE_MPEG2:%=fate-vsynth\%-%): CODEC = mpeg2video fate-vsynth%-mpeg2: ENCOPTS = -qscale 10 -fate-vsynth%-mpeg2-422: ENCOPTS = -vb 1000k \ +fate-vsynth%-mpeg2-422: ENCOPTS = -b:v 1000k \ -bf 2 \ -trellis 1 \ -flags +mv0+ildct+ilme \ @@ -134,7 +134,7 @@ fate-vsynth%-mpeg2-422: ENCOPTS = -vb 1000k \ -pix_fmt yuv422p fate-vsynth%-mpeg2-idct-int: ENCOPTS = -qscale 10 -idct int -dct int fate-vsynth%-mpeg2-ilace: ENCOPTS = -qscale 10 -flags +ildct+ilme -fate-vsynth%-mpeg2-ivlc-qprd: ENCOPTS = -vb 500k \ +fate-vsynth%-mpeg2-ivlc-qprd: ENCOPTS = -b:v 500k \ -bf 2 \ -trellis 1 \ -flags +mv0 \ |