aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-07-09 06:56:26 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-07-09 06:56:26 +0000
commit385b19dfd46e6aa5a89acf6744a65b0a8211b004 (patch)
treec4711796e0f4a80faf7b2fde86b524b13db287e7 /ffmpeg.c
parent7445f9cc675c946f355f53100a44996241c9eb88 (diff)
downloadffmpeg-385b19dfd46e6aa5a89acf6744a65b0a8211b004.tar.gz
Allow setting codecs through preset files
Originally committed as revision 14136 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 46455c1982..77985f30b7 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3639,6 +3639,13 @@ static int opt_preset(const char *opt, const char *arg)
fprintf(stderr, "Preset file invalid\n");
av_exit(1);
}
+ if(!strcmp(tmp, "acodec")){
+ opt_audio_codec(tmp2);
+ }else if(!strcmp(tmp, "vcodec")){
+ opt_video_codec(tmp2);
+ }else if(!strcmp(tmp, "scodec")){
+ opt_subtitle_codec(tmp2);
+ }else
opt_default(tmp, tmp2);
}