diff options
| author | Alexandra Hájková <alexandra.khirnova@gmail.com> | 2017-02-08 12:51:37 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-02-15 11:21:11 +0100 |
| commit | 0539d84d985e811e5989ef27c13f7e2dda0f9b89 (patch) | |
| tree | 5a2dc172240dcf0dbae104e16b23352868928144 /libavformat/riff.h | |
| parent | 871b4f3654636ed64560e86b9faa33828d195ceb (diff) | |
| download | ffmpeg-0539d84d985e811e5989ef27c13f7e2dda0f9b89.tar.gz | |
asfdec: Account for different Format Data sizes
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>
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 a45c7f301c..e5f4645c12 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); +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); |