Commit 8cf71ead authored by Roine Gustafsson's avatar Roine Gustafsson Committed by Michael Niedermayer

Adds read probe to y4m, and changes the extension to .y4m patch by (Roine...

Adds read probe to y4m, and changes the extension to .y4m patch by (Roine Gustafsson <roine users sourceforge net)

Originally committed as revision 4164 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 93b2b333
......@@ -170,7 +170,7 @@ AVOutputFormat yuv4mpegpipe_oformat = {
"yuv4mpegpipe",
"YUV4MPEG pipe format",
"",
"yuv4mpeg",
"y4m",
sizeof(int),
CODEC_ID_NONE,
CODEC_ID_RAWVIDEO,
......@@ -375,15 +375,26 @@ static int yuv4_read_close(AVFormatContext *s)
return 0;
}
static int yuv4_probe(AVProbeData *pd)
{
/* check file header */
if (pd->buf_size <= sizeof(Y4M_MAGIC))
return 0;
if (strncmp(pd->buf, Y4M_MAGIC, sizeof(Y4M_MAGIC)-1)==0)
return AVPROBE_SCORE_MAX;
else
return 0;
}
AVInputFormat yuv4mpegpipe_iformat = {
"yuv4mpegpipe",
"YUV4MPEG pipe format",
0,
NULL,
yuv4_probe,
yuv4_read_header,
yuv4_read_packet,
yuv4_read_close,
.extensions = "yuv4mpeg"
.extensions = "y4m"
};
int yuv4mpeg_init(void)
......
......@@ -39,8 +39,8 @@ f34e560f8f0f2c603cf0cb3e7eeb031b *./data/b-libav.nut
./data/b-libav.ppm CRC=b2bb8e92
88a98269295fbfce7816558ad84e1259 *./data/b-libav.gif
2906382 ./data/b-libav.gif
b977a4fedff90a79baf70c8e02986820 *./data/b-libav.yuv4mpeg
3801810 ./data/b-libav.yuv4mpeg
b977a4fedff90a79baf70c8e02986820 *./data/b-libav.y4m
3801810 ./data/b-libav.y4m
./data/b-libav%d.pgm CRC=84c09106
./data/b-libav%d.ppm CRC=25c06ecf
./data/b-libav%d.jpg CRC=62328baa
......
......@@ -608,7 +608,7 @@ do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
#do_ffmpeg_crc $file -i $file
# yuv4mpeg
file=${outfile}libav.yuv4mpeg
file=${outfile}libav.y4m
do_ffmpeg $file -t 1 -y -qscale 10 -f pgmyuv -i $raw_src $file
#do_ffmpeg_crc $file -i $file
......
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