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 /cmdutils_common_opts.h | |
| parent | 69fc2489c4059886fcda2de91029b43447330951 (diff) | |
| parent | 7f9aaa499b8a5ce066cc17aac6ebbdf0111980b6 (diff) | |
| download | ffmpeg-6c180b35c43f0738d8a3d5c08a01209b51eda569.tar.gz | |
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 'cmdutils_common_opts.h')
| -rw-r--r-- | cmdutils_common_opts.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h index 855cb889be..3fb74d6839 100644 --- a/cmdutils_common_opts.h +++ b/cmdutils_common_opts.h @@ -5,7 +5,9 @@ { "-help", OPT_EXIT, {(void*)opt_help}, "show help" }, { "version", OPT_EXIT, {(void*)opt_version}, "show version" }, { "formats" , OPT_EXIT, {(void*)opt_formats }, "show available formats" }, - { "codecs" , OPT_EXIT, {(void*)opt_codecs }, "show available codecs" }, + { "codecs" , OPT_EXIT, {(void*)show_codecs }, "show available codecs" }, + { "decoders" , OPT_EXIT, {(void*)show_decoders }, "show available decoders" }, + { "encoders" , OPT_EXIT, {(void*)show_encoders }, "show available encoders" }, { "bsfs" , OPT_EXIT, {(void*)opt_bsfs }, "show available bit stream filters" }, { "protocols", OPT_EXIT, {(void*)opt_protocols}, "show available protocols" }, { "filters", OPT_EXIT, {(void*)opt_filters }, "show available filters" }, |