Skip to content

Commit

Permalink
* fixing -target *dv issues with not setting pix_fmt and adding dv50…
Browse files Browse the repository at this point in the history
… target

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5244 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
  • Loading branch information
romansh committed Mar 30, 2006
1 parent 79c20c2 commit a257603
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions ffmpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -3936,11 +3936,13 @@ static void opt_target(const char *arg)
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;
Expand Down Expand Up @@ -4014,7 +4016,7 @@ const OptionDef options[] = {
{ "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", "" },
Expand Down

0 comments on commit a257603

Please sign in to comment.