diff options
| author | Robin Gareus <robin@gareus.org> | 2015-06-23 17:11:45 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-06-23 17:11:45 +0200 |
| commit | 2cb511e25a94b881a43e4e35972c247d9ad3930b (patch) | |
| tree | 7524d912d0541942fc71a2b534211a01b6003d28 | |
| parent | 97c972223663564110702b23c0964d697bc903b4 (diff) | |
update video import flags, relax GOP size.
| -rw-r--r-- | gtk2_ardour/transcode_ffmpeg.cc | 13 | ||||
| -rw-r--r-- | gtk2_ardour/video_timeline.cc | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc index 0f77000882..7ecdc36384 100644 --- a/gtk2_ardour/transcode_ffmpeg.cc +++ b/gtk2_ardour/transcode_ffmpeg.cc @@ -470,7 +470,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh, if (bitrate < 10) bitrate = 10; if (bitrate > 1000) bitrate = 1000; - argp=(char**) calloc(16,sizeof(char*)); + argp=(char**) calloc(15,sizeof(char*)); argp[0] = strdup(ffmpeg_exe.c_str()); argp[1] = strdup("-i"); argp[2] = strdup(infile.c_str()); @@ -482,16 +482,15 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh, argp[8] = strdup("-vcodec"); argp[9] = strdup("mpeg4"); argp[10] = strdup("-an"); - argp[11] = strdup("-intra"); - argp[12] = strdup("-g"); - argp[13] = strdup("1"); - argp[14] = strdup(outfile.c_str()); - argp[15] = (char *)0; + argp[11] = strdup("-keyint_min"); + argp[12] = strdup("10"); + argp[13] = strdup(outfile.c_str()); + argp[14] = (char *)0; /* Note: these are free()d in ~SystemExec */ #if 1 /* DEBUG */ if (debug_enable) { /* tentative debug mode */ printf("TRANSCODE VIDEO:\n"); - for (int i=0; i< 15; ++i) { + for (int i=0; i< 14; ++i) { printf("%s ", argp[i]); } printf("\n"); diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index a1dd4bcfbb..12236eec38 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -761,14 +761,13 @@ VideoTimeLine::find_xjadeo () { { if (v_major >= 1) v_ok = true; else if (v_major == 0 && v_minor >= 8) v_ok = true; - else if (v_major == 0 && v_minor >= 7 && v_micro >= 7) v_ok = true; } } if (!v_ok) { _xjadeo_bin = X_(""); warning << _( "Video-monitor 'xjadeo' is too old. " - "Please install xjadeo version 0.7.7 or later. http://xjadeo.sf.net/" + "Please install xjadeo version 0.8.0 or later. http://xjadeo.sf.net/" ) << endmsg; } } |