generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: fix overriding codecs with the new syntax

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-09-22 17:56:35 +02:00
parent 8364bde02b
commit bad953bc2d
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ffmpeg_opt.c
View File

@ -54,6 +54,17 @@
}\ }\
} }
#define MATCH_PER_TYPE_OPT(name, type, outvar, fmtctx, mediatype)\
{\
int i, ret;\
for (i = 0; i < o->nb_ ## name; i++) {\
char *spec = o->name[i].specifier;\
if (!strcmp(spec, mediatype) || !*spec)\
outvar = o->name[i].u.type;\
else if (ret < 0)\
exit_program(1);\
}\
}
char *vstats_filename; char *vstats_filename;
float audio_drift_threshold = 0.1; float audio_drift_threshold = 0.1;
@ -688,6 +699,9 @@ static int opt_input_file(void *optctx, const char *opt, const char *filename)
uint8_t buf[128]; uint8_t buf[128];
AVDictionary **opts; AVDictionary **opts;
int orig_nb_streams; // number of streams before avformat_find_stream_info int orig_nb_streams; // number of streams before avformat_find_stream_info
char * video_codec_name = NULL;
char * audio_codec_name = NULL;
char *subtitle_codec_name = NULL;
if (o->format) { if (o->format) {
if (!(file_iformat = av_find_input_format(o->format))) { if (!(file_iformat = av_find_input_format(o->format))) {
@ -740,6 +754,10 @@ static int opt_input_file(void *optctx, const char *opt, const char *filename)
if (o->nb_frame_pix_fmts) if (o->nb_frame_pix_fmts)
av_dict_set(&format_opts, "pixel_format", o->frame_pix_fmts[o->nb_frame_pix_fmts - 1].u.str, 0); av_dict_set(&format_opts, "pixel_format", o->frame_pix_fmts[o->nb_frame_pix_fmts - 1].u.str, 0);
MATCH_PER_TYPE_OPT(codec_names, str, video_codec_name, ic, "v");
MATCH_PER_TYPE_OPT(codec_names, str, audio_codec_name, ic, "a");
MATCH_PER_TYPE_OPT(codec_names, str, subtitle_codec_name, ic, "s");
ic->video_codec_id = video_codec_name ? ic->video_codec_id = video_codec_name ?
find_codec_or_die(video_codec_name , AVMEDIA_TYPE_VIDEO , 0)->id : AV_CODEC_ID_NONE; find_codec_or_die(video_codec_name , AVMEDIA_TYPE_VIDEO , 0)->id : AV_CODEC_ID_NONE;
ic->audio_codec_id = audio_codec_name ? ic->audio_codec_id = audio_codec_name ?