diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-25 04:00:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-25 04:00:43 +0100 |
| commit | b008ac18bb6072acb355445436a999c940538d84 (patch) | |
| tree | 29d0042d7a4d0bc64f452440c2060a13a1e00e51 /doc/ffmpeg.texi | |
| parent | 7b9d8703f35585b065c32194b52131b7dd90c710 (diff) | |
| parent | d6a77e2b97f3968b99798faeb70e873eb5910849 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
docs: use -bsf:[vas] instead of -[vas]bsf.
mpegaudiodec: Prevent premature clipping of mp3 input buffer.
lavf: move the packet keyframe setting code.
oggenc: free comment header for all codecs
lcl: error out if uncompressed input buffer is smaller than framesize.
mjpeg: abort decoding if packet is too large.
golomb: use HAVE_BITS_REMAINING() macro to prevent infloop on EOF.
get_bits: add HAVE_BITS_REMAINING macro.
lavf/output-example: use new audio encoding API correctly.
lavf/output-example: more proper usage of the new API.
tiff: Prevent overreads in the type_sizes array.
tiff: Make the TIFF_LONG and TIFF_SHORT types unsigned.
apetag: do not leak memory if avio_read() fails
apetag: propagate errors.
SBR DSP x86: implement SSE sbr_hf_g_filt
SBR DSP x86: implement SSE sbr_sum_square_sse
SBR DSP: use intptr_t for the ixh parameter.
Conflicts:
doc/bitstream_filters.texi
doc/examples/muxing.c
doc/ffmpeg.texi
libavcodec/golomb.h
libavcodec/x86/Makefile
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.texi')
| -rw-r--r-- | doc/ffmpeg.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 51a282ef0c..128aceccb0 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1019,10 +1019,10 @@ Set bitstream filters for matching streams. @var{bistream_filters} is a comma-separated list of bitstream filters. Use the @code{-bsfs} option to get the list of bitstream filters. @example -ffmpeg -i h264.mp4 -c:v copy -vbsf h264_mp4toannexb -an out.h264 +ffmpeg -i h264.mp4 -c:v copy -bsf:v h264_mp4toannexb -an out.h264 @end example @example -ffmpeg -i file.mov -an -vn -sbsf mov2textsub -c:s copy -f rawvideo sub.txt +ffmpeg -i file.mov -an -vn -bsf:s mov2textsub -c:s copy -f rawvideo sub.txt @end example @item -tag[:@var{stream_specifier}] @var{codec_tag} (@emph{per-stream}) |