[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c, 1.374, 1.375 Changelog, 1.75, 1.76

[Roman Shaposhnick]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv26100/ffmpeg

Modified Files:
	ffmpeg.c Changelog 
Log Message:

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


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -d -r1.374 -r1.375
--- ffmpeg.c	29 Mar 2006 08:25:09 -0000	1.374
+++ ffmpeg.c	30 Mar 2006 02:36:02 -0000	1.375
@@ -3936,11 +3936,13 @@
         audio_bit_rate = 448000;
         audio_sample_rate = 48000;
 
-    } else if(!strcmp(arg, "dv")) {
+    } else if(!strncmp(arg, "dv", 2)) {
 
         opt_format("dv");
 
         opt_frame_size(norm ? "720x480" : "720x576");
+        opt_frame_pix_fmt(!strncmp(arg, "dv50", 4) ? "yuv422p" :
+                                             (norm ? "yuv411p" : "yuv420p"));
         opt_frame_rate(frame_rates[norm]);
 
         audio_sample_rate = 48000;
@@ -4014,7 +4016,7 @@
     { "loop_input", OPT_BOOL | OPT_EXPERT, {(void*)&loop_input}, "loop (current only works with images)" },
     { "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)", "" },
     { "v", HAS_ARG, {(void*)opt_verbose}, "control amount of logging", "verbose" },
-    { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
+    { "target", HAS_ARG, {(void*)opt_target}, "specify target file type (\"vcd\", \"svcd\", \"dvd\", \"dv\", \"dv50\", \"pal-vcd\", \"ntsc-svcd\", ...)", "type" },
     { "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
     { "vsync", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&video_sync_method}, "video sync method", "" },
     { "async", HAS_ARG | OPT_INT | OPT_EXPERT, {(void*)&audio_sync_method}, "audio sync method", "" },

Index: Changelog
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Changelog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- Changelog	27 Mar 2006 22:22:49 -0000	1.75
+++ Changelog	30 Mar 2006 02:36:02 -0000	1.76
@@ -1,4 +1,5 @@
 version <next>
+- DV50 AKA DVCPRO50 encoder, decoder, muxer and demuxer
 - TechSmith Camtasia (TSCC) video decoder
 - IBM Ultimotion (ULTI) video decoder
 - Sierra Online audio file demuxer and decoder