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/riff.h | |
| parent | e2a5fa11b2a20a579d425ce6e162873660333445 (diff) | |
| parent | 0539d84d985e811e5989ef27c13f7e2dda0f9b89 (diff) | |
| download | ffmpeg-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/riff.h')
| -rw-r--r-- | libavformat/riff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/riff.h b/libavformat/riff.h index c916d1a587..323aa38b4d 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); |