videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avformat/flacdec, takdec: Use FFRawDemuxerContext directly 

The beginning of the private contexts of both the FLAC and the TAK
demuxer currently mimick FFRawDemuxerContext: A pointer to an AVClass
followed by the AVOpt-enabled field raw_packet_size. Said field is only
used by the demuxers' read_packet functions via
ff_raw_read_partial_packet(), which treats the private context as an
FFRaawDemuxerContext. Yet this is fragile, so better include a
FFRawDemuxerContext struct at the beginning of said demuxers' private
contexts.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-06-07 19:49:20 +02:00
parent cd564ee547
commit 779dba0fc0
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/flacdec.c
View File

@ -31,8 +31,7 @@
#define SEEKPOINT_SIZE 18
typedef struct FLACDecContext {
AVClass *class;
int raw_packet_size;
FFRawDemuxerContext rawctx;
int found_seektable;
} FLACDecContext;

3
libavformat/takdec.c
View File

@ -31,8 +31,7 @@
#include "rawdec.h"
typedef struct TAKDemuxContext {
AVClass *class;
int raw_packet_size;
FFRawDemuxerContext rawctx;
int mlast_frame;
int64_t data_end;
} TAKDemuxContext;