diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-02-21 15:32:56 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-02-21 15:32:56 +0000 |
| commit | 31f2616db86fb50174bc053f26c14db7c03e3685 (patch) | |
| tree | 1180636eeb907844f448218c42799300be27e09d /libavformat | |
| parent | 431ac290461df62b0e982e88163377080e5bf290 (diff) | |
| download | ffmpeg-31f2616db86fb50174bc053f26c14db7c03e3685.tar.gz | |
Fix raw rgb/bgr vertical flip in avi based on info from http://www.fourcc.org/fccbihgt.php.
partially fixes issue862.
Originally committed as revision 17475 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 11 | ||||
| -rw-r--r-- | libavformat/riff.c | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e3cc14c958..2216b35582 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -451,7 +451,7 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) } get_le32(pb); /* size */ st->codec->width = get_le32(pb); - st->codec->height = get_le32(pb); + st->codec->height = (int32_t)get_le32(pb); get_le16(pb); /* panes */ st->codec->bits_per_coded_sample= get_le16(pb); /* depth */ tag1 = get_le32(pb); @@ -499,6 +499,15 @@ static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->codec_tag = tag1; st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1); st->need_parsing = AVSTREAM_PARSE_HEADERS; // This is needed to get the pict type which is necessary for generating correct pts. + + if(st->codec->codec_tag==0 && st->codec->height > 0 && st->codec->extradata_size < 1U<<30){ + st->codec->extradata_size+= 9; + st->codec->extradata= av_realloc(st->codec->extradata, st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); + if(st->codec->extradata) + memcpy(st->codec->extradata + st->codec->extradata_size - 9, "BottomUp", 9); + } + st->codec->height= FFABS(st->codec->height); + // url_fskip(pb, size - 5 * 4); break; case CODEC_TYPE_AUDIO: diff --git a/libavformat/riff.c b/libavformat/riff.c index e1745a2647..594eb63202 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -368,7 +368,8 @@ void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *ta { put_le32(pb, 40 + enc->extradata_size); /* size */ put_le32(pb, enc->width); - put_le32(pb, enc->height); + //We always store RGB TopDown + put_le32(pb, enc->codec_tag ? enc->height : -enc->height); put_le16(pb, 1); /* planes */ put_le16(pb, enc->bits_per_coded_sample ? enc->bits_per_coded_sample : 24); /* depth */ |