[SCM] libav/experimental: Remove ffmpeg PGMYUV compatibility hack, which was deprecated since ages.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:18:25 UTC 2013


The following commit has been merged in the experimental branch:
commit 0422af7e49dbd3ac1d552edcd7972e266e0202a4
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Nov 2 00:29:13 2010 +0000

    Remove ffmpeg PGMYUV compatibility hack, which was deprecated since
    ages.
    
    The user is requested to specify "-f image2" in place of "-f pgmyuv"
    for reading/writing PGMYUV files, as for the other image formats.
    
    Originally committed as revision 25629 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index edea4fd..27358f9 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -228,7 +228,6 @@ static uint64_t limit_filesize = 0;
 static int force_fps = 0;
 static char *forced_key_frames = NULL;
 
-static int pgmyuv_compatibility_hack=0;
 static float dts_delta_threshold = 10;
 
 static unsigned int sws_flags = SWS_BICUBIC;
@@ -2652,14 +2651,6 @@ static int transcode(AVFormatContext **output_files,
 
 static void opt_format(const char *arg)
 {
-    /* compatibility stuff for pgmyuv */
-    if (!strcmp(arg, "pgmyuv")) {
-        pgmyuv_compatibility_hack=1;
-//        opt_image_format(arg);
-        arg = "image2";
-        fprintf(stderr, "pgmyuv format is deprecated, use image2\n");
-    }
-
     last_asked_format = arg;
 }
 
@@ -3046,9 +3037,6 @@ static void opt_input_file(const char *filename)
                           avcodec_opts[AVMEDIA_TYPE_SUBTITLE]->strict_std_compliance);
     ic->flags |= AVFMT_FLAG_NONBLOCK;
 
-    if(pgmyuv_compatibility_hack)
-        ic->video_codec_id= CODEC_ID_PGMYUV;
-
     /* open the input file with generic libav function */
     err = av_open_input_file(&ic, filename, file_iformat, 0, ap);
     if (err < 0) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list