master merge; new files not added after initial cairocanvas patch application

[ardour.git] / gtk2_ardour / transcode_ffmpeg.cc

diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 7780c4f02bfa91e6d30e7e19848fffda6663309e..854b7def2228c53da3e9c3e0227ac15190803d76 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -464,7 +464,7 @@ TranscodeFfmpeg::transcode (std::string outfile, const int outw, const int outh,
        argp[6] = (char*) calloc(10,sizeof(char)); snprintf(argp[6], 10, "%ix%i", width, height);
        argp[7] = strdup("-y");
        argp[8] = strdup("-vcodec");
-       argp[9] = strdup("mjpeg");
+       argp[9] = strdup("mpeg4");
        argp[10] = strdup("-an");
        argp[11] = strdup("-intra");
        argp[12] = strdup("-g");