apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-03 09:41:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

asfdec: Account for different Format Data sizes

Browse Source 
Some muxers may use the BMP_HEADER Format Data size instead
of the ASF-specific one.

Bug-Id: 1020
CC: libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Alexandra Hájková
2017-02-08 12:51:37 +01:00
committed by Diego Biurrun
parent 871b4f3654
commit 0539d84d98
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/riff.h
View File

@@ -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);
int ff_get_bmp_header(AVIOContext *pb, AVStream *st, uint32_t *size);
void ff_put_bmp_header(AVIOContext *pb, AVCodecParameters *par, const AVCodecTag *tags, int for_asf);
int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecParameters *par);