diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:51:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 13:51:07 +0200 |
| commit | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (patch) | |
| tree | e4566b574da96ea49e59e3d5bc03ecbbde903f15 /doc/faq.texi | |
| parent | eb71f027f0581fd732fe33e559e38855f90da66f (diff) | |
| parent | fb722a900fc5cc9e003b9fef25b27ed7fc5547a2 (diff) | |
| download | ffmpeg-b7ebb49d035205bcfbcc4f1788df5ba1419fadc8.tar.gz | |
Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'
* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2':
avconv: remove -same_quant
Conflicts:
Changelog
doc/faq.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/faq.texi')
| -rw-r--r-- | doc/faq.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/faq.texi b/doc/faq.texi index 30259dd401..5477faf219 100644 --- a/doc/faq.texi +++ b/doc/faq.texi @@ -297,7 +297,7 @@ mkfifo intermediate2.mpg ffmpeg -i input1.avi -qscale:v 1 -y intermediate1.mpg < /dev/null & ffmpeg -i input2.avi -qscale:v 1 -y intermediate2.mpg < /dev/null & cat intermediate1.mpg intermediate2.mpg |\ -ffmpeg -f mpeg -i - -qscale:v 2 -c:v mpeg4 -acodec libmp3lame -q:a 4 output.avi +ffmpeg -f mpeg -i - -c:v mpeg4 -acodec libmp3lame output.avi @end example @subsection Concatenating using raw audio and video @@ -327,7 +327,7 @@ cat temp1.a temp2.a > all.a & cat temp1.v temp2.v > all.v & ffmpeg -f u16le -acodec pcm_s16le -ac 2 -ar 44100 -i all.a \ -f yuv4mpegpipe -i all.v \ - -qscale:v 2 -y output.flv + -y output.flv rm temp[12].[av] all.[av] @end example |