diff options
| author | James Almer <jamrial@gmail.com> | 2017-09-28 00:18:10 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-09-28 00:28:38 -0300 |
| commit | 42f27d1b8eab9ea88d2e9faeb35f72dd72eca7b4 (patch) | |
| tree | 0e447ffc5700b355bd8699269726f07d6e2eddb2 /libavformat/riffdec.c | |
| parent | e2a5fa11b2a20a579d425ce6e162873660333445 (diff) | |
| parent | 0539d84d985e811e5989ef27c13f7e2dda0f9b89 (diff) | |
| download | ffmpeg-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/riffdec.c')
| -rw-r--r-- | libavformat/riffdec.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 */ |
