Browse code

* fixing -target *dv issues with not setting pix_fmt and adding dv50 target

Originally committed as revision 5244 to svn://svn.ffmpeg.org/ffmpeg/trunk

Roman Shaposhnik authored on 2006/03/30 11:36:02
Showing 2 changed files
... ...
@@ -1,4 +1,5 @@
1 1
 version <next>
2
+- DV50 AKA DVCPRO50 encoder, decoder, muxer and demuxer
2 3
 - TechSmith Camtasia (TSCC) video decoder
3 4
 - IBM Ultimotion (ULTI) video decoder
4 5
 - Sierra Online audio file demuxer and decoder
... ...
@@ -3936,11 +3936,13 @@ static void opt_target(const char *arg)
3936 3936
         audio_bit_rate = 448000;
3937 3937
         audio_sample_rate = 48000;
3938 3938
 
3939
-    } else if(!strcmp(arg, "dv")) {
3939
+    } else if(!strncmp(arg, "dv", 2)) {
3940 3940
 
3941 3941
         opt_format("dv");
3942 3942
 
3943 3943
         opt_frame_size(norm ? "720x480" : "720x576");
3944
+        opt_frame_pix_fmt(!strncmp(arg, "dv50", 4) ? "yuv422p" :
3945
+                                             (norm ? "yuv411p" : "yuv420p"));
3944 3946
         opt_frame_rate(frame_rates[norm]);
3945 3947
 
3946 3948
         audio_sample_rate = 48000;
... ...
@@ -4014,7 +4016,7 @@ const OptionDef options[] = {
4014 4014
     { "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" },
4015 4015
     { "loop_output", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&loop_output}, "number of times to loop output in formats that support looping (0 loops forever)", "" },
4016 4016
     { "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" },
4017
-    { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
4017
+    { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
4018 4018
     { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
4019 4019
     { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
4020 4020
     { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },