Commit 0422af7e authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

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
parent 80e33d24
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment