summaryrefslogtreecommitdiff
path: root/libavcodec/internal.h
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2017-03-08 12:36:05 +0100
committerwm4 <nfxjfg@googlemail.com>2017-03-09 10:16:12 +0100
commitfcfc78cbabb6b454aa9e39ad32ae7a766dcf33d8 (patch)
tree56d74ac12da56ee6e5d222bf76ef1f86ef38ba8b /libavcodec/internal.h
parent53a5cea478616d2caa1c07aa58b6b911bd80c285 (diff)
aacdec: do not mutate input packet metadata
Apparently the demuxer outputs the wrong padding for HE-AAC (based on the raw sample rate, or so). aacdec contains a hack to adjust the muxer padding accordingly before it's used to trim the decoder output. This modified the packet side data, which in combination with the old decoding API would change the packet the user passed to the decoder. This is clearly not allowed, and it breaks running some gapless fate tests with "-fflags +keepside" applied (without keepside, the packet metadata is typically newly allocated, essentially making a copy and not modifying the user's input packet). This should probably be fixed in the demuxer (and consequently also the muxer), but for now only fix the immediate problem. Regression since 946ed78f5f8 (2012).
Diffstat (limited to 'libavcodec/internal.h')
-rw-r--r--libavcodec/internal.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index c92dba472a..e3286d2a58 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -174,6 +174,8 @@ typedef struct AVCodecInternal {
AVFrame *buffer_frame;
int draining_done;
int showed_multi_packet_warning;
+
+ int skip_samples_multiplier;
} AVCodecInternal;
struct AVCodecDefault {