From 095247b1c1ffb7ed173a84a529cbb75658dc5ab5 Mon Sep 17 00:00:00 2001
From: avcoder <ffmpeg@gmail.com>
Date: Thu, 7 Jun 2007 16:43:34 +0000
Subject: [PATCH] Change names of codecs provided by external libraries in
 examples to account for the recent renamings of those codecs. patch by
 QuickTime, ffmpeg gmail com

Originally committed as revision 9247 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 doc/faq.texi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/faq.texi b/doc/faq.texi
index 6024ceea8d..c4f0047ba2 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -167,34 +167,34 @@ default.
 
 @table @option
 @item needed stuff
--acodec aac -vcodec mpeg4 width<=320 height<=240
+-acodec libfaac -vcodec mpeg4 width<=320 height<=240
 @item working stuff
 4mv, title
 @item non-working stuff
 B-frames
 @item example command line
-ffmpeg -i input -acodec aac -ab 128kb -vcodec mpeg4 -b 1200kb -mbd 2 -flags +4mv+trell -aic 2 -cmp 2 -subcmp 2 -s 320x180 -title X output.mp4
+ffmpeg -i input -acodec libfaac -ab 128kb -vcodec mpeg4 -b 1200kb -mbd 2 -flags +4mv+trell -aic 2 -cmp 2 -subcmp 2 -s 320x180 -title X output.mp4
 @end table
 
 @section How do I encode videos which play on the PSP?
 
 @table @option
 @item needed stuff
--acodec aac -vcodec mpeg4 width*height<=76800 width%16=0 height%16=0 -ar 24000 -r 30000/1001 or 15000/1001 -f psp
+-acodec libfaac -vcodec mpeg4 width*height<=76800 width%16=0 height%16=0 -ar 24000 -r 30000/1001 or 15000/1001 -f psp
 @item working stuff
 4mv, title
 @item non-working stuff
 B-frames
 @item example command line
-ffmpeg -i input -acodec aac -ab 128kb -vcodec mpeg4 -b 1200kb -ar 24000 -mbd 2 -flags +4mv+trell -aic 2 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -title X -f psp output.mp4
+ffmpeg -i input -acodec libfaac -ab 128kb -vcodec mpeg4 -b 1200kb -ar 24000 -mbd 2 -flags +4mv+trell -aic 2 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -title X -f psp output.mp4
 @item needed stuff for H.264
--acodec aac -vcodec h264 width*height<=76800 width%16=0? height%16=0? -ar 48000 -coder 1 -r 30000/1001 or 15000/1001 -f psp
+-acodec libfaac -vcodec h264 width*height<=76800 width%16=0? height%16=0? -ar 48000 -coder 1 -r 30000/1001 or 15000/1001 -f psp
 @item working stuff for H.264
 title, loop filter
 @item non-working stuff for H.264
 CAVLC
 @item example command line
-ffmpeg -i input -acodec aac -ab 128kb -vcodec h264 -b 1200kb -ar 48000 -mbd 2 -coder 1 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -title X -f psp -flags loop -trellis 2 -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 output.mp4
+ffmpeg -i input -acodec libfaac -ab 128kb -vcodec h264 -b 1200kb -ar 48000 -mbd 2 -coder 1 -cmp 2 -subcmp 2 -s 368x192 -r 30000/1001 -title X -f psp -flags loop -trellis 2 -partitions parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 output.mp4
 @end table
 
 @section Which are good parameters for encoding high quality MPEG-4?
@@ -280,7 +280,7 @@ mkfifo intermediate2.mpg
 ffmpeg -i input1.avi -sameq -y intermediate1.mpg < /dev/null &
 ffmpeg -i input2.avi -sameq -y intermediate2.mpg < /dev/null &
 cat intermediate1.mpg intermediate2.mpg |\
-ffmpeg -f mpeg -i - -sameq -vcodec mpeg4 -acodec mp3 output.avi
+ffmpeg -f mpeg -i - -sameq -vcodec mpeg4 -acodec libmp3lame output.avi
 @end example
 
 Similarly, the yuv4mpegpipe format, and the raw video, raw audio codecs also