starred/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 23:21:06 +01:00
Code Issues 5 Projects Packages Wiki Activity Actions

Merge commit '0539d84d98'

Browse source 
* commit '0539d84d98':
  asfdec: Account for different Format Data sizes

See 76853a3e0c

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-09-28 00:18:10 -03:00
commit 42f27d1b8e
3 changed files with 13 additions and 9 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, 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);