diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-18 15:10:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-18 15:20:32 +0200 |
| commit | 6c180b35c43f0738d8a3d5c08a01209b51eda569 (patch) | |
| tree | b278223305ed9dc4af792f53a376a558ad9155ee /doc | |
| parent | 69fc2489c4059886fcda2de91029b43447330951 (diff) | |
| parent | 7f9aaa499b8a5ce066cc17aac6ebbdf0111980b6 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: don't use deprecated avcodec_encode_video().
cmdutils: refactor -codecs option.
avconv: make -shortest a per-output file option.
lavc: add avcodec_descriptor_get_by_name().
lavc: add const to AVCodec* function parameters.
swf(dec): replace CODEC_ID with AV_CODEC_ID
dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
rtmpdh: Do not generate the same private key every time when using libnettle
rtp: remove ff_rtp_get_rtcp_file_handle().
rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
avio: add (ff)url_get_multi_file_handle() for getting more than one fd
h264: vdpau: fix crash with unsupported colorspace
amrwbdec: Decode the fr_quality bit properly
Conflicts:
Changelog
cmdutils.c
cmdutils_common_opts.h
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
libavcodec/h264.c
libavcodec/options.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/avtools-common-opts.texi | 25 | ||||
| -rw-r--r-- | doc/ffmpeg.texi | 2 |
2 files changed, 10 insertions, 17 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index b05b5fa84e..91460b30b2 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -72,23 +72,16 @@ Encoding available @end table @item -codecs -Show available codecs. +Show all codecs known to libavcodec. -The fields preceding the codec names have the following meanings: -@table @samp -@item D -Decoding available -@item E -Encoding available -@item V/A/S -Video/audio/subtitle codec -@item S -Codec supports slices -@item D -Codec supports direct rendering -@item T -Codec can handle input truncated at random locations instead of only at frame boundaries -@end table +Note that the term 'codec' is used throughout this documentation as a shortcut +for what is more correctly called a media bitstream format. + +@item -decoders +Show available decoders. + +@item -encoders +Show all available encoders. @item -bsfs Show available bitstream filters. diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index ab7697abc5..89c1eb84c7 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -928,7 +928,7 @@ Try to make the choice automatically, in order to generate a sane output. Default value is -1. -@item -shortest +@item -shortest (@emph{output}) Finish encoding when the shortest input stream ends. @item -dts_delta_threshold Timestamp discontinuity delta threshold. |