Commit ecc42f4f authored by michael's avatar michael

image2pipe fix


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3635 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent cbe1871d
...@@ -37,6 +37,7 @@ static const IdStrMap img_tags[] = { ...@@ -37,6 +37,7 @@ static const IdStrMap img_tags[] = {
{ CODEC_ID_MJPEG , "jpeg"}, { CODEC_ID_MJPEG , "jpeg"},
{ CODEC_ID_MJPEG , "jpg"}, { CODEC_ID_MJPEG , "jpg"},
{ CODEC_ID_LJPEG , "ljpg"}, { CODEC_ID_LJPEG , "ljpg"},
// { CODEC_ID_PNG , "png"},
{ CODEC_ID_MPEG1VIDEO, "mpg1-img"}, { CODEC_ID_MPEG1VIDEO, "mpg1-img"},
{ CODEC_ID_MPEG2VIDEO, "mpg2-img"}, { CODEC_ID_MPEG2VIDEO, "mpg2-img"},
{ CODEC_ID_MPEG4 , "mpg4-img"}, { CODEC_ID_MPEG4 , "mpg4-img"},
...@@ -153,8 +154,10 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap) ...@@ -153,8 +154,10 @@ static int img_read_header(AVFormatContext *s1, AVFormatParameters *ap)
/* find format */ /* find format */
if (s1->iformat->flags & AVFMT_NOFILE) if (s1->iformat->flags & AVFMT_NOFILE)
s->is_pipe = 0; s->is_pipe = 0;
else else{
s->is_pipe = 1; s->is_pipe = 1;
st->need_parsing= 1;
}
if (!ap || !ap->frame_rate) { if (!ap || !ap->frame_rate) {
st->codec.frame_rate = 25; st->codec.frame_rate = 25;
......
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