summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-09-28 00:18:10 -0300
committerJames Almer <jamrial@gmail.com>2017-09-28 00:28:38 -0300
commit42f27d1b8eab9ea88d2e9faeb35f72dd72eca7b4 (patch)
tree0e447ffc5700b355bd8699269726f07d6e2eddb2 /libavformat
parente2a5fa11b2a20a579d425ce6e162873660333445 (diff)
parent0539d84d985e811e5989ef27c13f7e2dda0f9b89 (diff)
downloadffmpeg-streaming-42f27d1b8eab9ea88d2e9faeb35f72dd72eca7b4.zip
ffmpeg-streaming-42f27d1b8eab9ea88d2e9faeb35f72dd72eca7b4.tar.gz
Merge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89'
* commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89': asfdec: Account for different Format Data sizes See 76853a3e0ce4d4ef09ffcca7307991b8db832cd4 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asfdec_o.c12
-rw-r--r--libavformat/riff.h3
-rw-r--r--libavformat/riffdec.c7
3 files changed, 13 insertions, 9 deletions
diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c
index 7450ea0..86ea962 100644
--- a/libavformat/asfdec_o.c
+++ b/libavformat/asfdec_o.c
@@ -691,20 +691,22 @@ static int asf_read_properties(AVFormatContext *s, const GUIDParseTable *g)
static int parse_video_info(AVIOContext *pb, AVStream *st)
{
- uint16_t size;
+ uint16_t size_asf; // ASF-specific Format Data size
+ uint32_t size_bmp; // BMP_HEADER-specific Format Data size
unsigned int tag;
st->codecpar->width = avio_rl32(pb);
st->codecpar->height = avio_rl32(pb);
avio_skip(pb, 1); // skip reserved flags
- size = avio_rl16(pb); // size of the Format Data
- tag = ff_get_bmp_header(pb, st, NULL);
+ size_asf = avio_rl16(pb);
+ tag = ff_get_bmp_header(pb, st, &size_bmp);
st->codecpar->codec_tag = tag;
st->codecpar->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
+ size_bmp = FFMAX(size_asf, size_bmp);
- if (size > BMP_HEADER_SIZE) {
+ if (size_bmp > BMP_HEADER_SIZE) {
int ret;
- st->codecpar->extradata_size = size - BMP_HEADER_SIZE;
+ st->codecpar->extradata_size = size_bmp - BMP_HEADER_SIZE;
if (!(st->codecpar->extradata = av_malloc(st->codecpar->extradata_size +
AV_INPUT_BUFFER_PADDING_SIZE))) {
st->codecpar->extradata_size = 0;
diff --git a/libavformat/riff.h b/libavformat/riff.h
index c916d1a..323aa38 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -41,9 +41,10 @@ void ff_end_tag(AVIOContext *pb, int64_t start);
/**
* Read BITMAPINFOHEADER structure and set AVStream codec width, height and
* bits_per_encoded_sample fields. Does not read extradata.
+ * Writes the size of the BMP file to *size.
* @return codec tag
*/
-int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize);
+int ff_get_bmp_header(AVIOContext *pb, AVStream *st, uint32_t *size);
void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, int for_asf, int ignore_extradata);
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 656a9eb..b448f91 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -208,11 +208,12 @@ enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps)
return id;
}
-int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize)
+int ff_get_bmp_header(AVIOContext *pb, AVStream *st, uint32_t *size)
{
int tag1;
- if(esize) *esize = avio_rl32(pb);
- else avio_rl32(pb);
+ uint32_t size_ = avio_rl32(pb);
+ if (size)
+ *size = size_;
st->codecpar->width = avio_rl32(pb);
st->codecpar->height = (int32_t)avio_rl32(pb);
avio_rl16(pb); /* planes */
OpenPOWER on IntegriCloud