summaryrefslogtreecommitdiffstats
path: root/libavformat/internal.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-09-22 15:24:34 +0200
committerAnton Khirnov <anton@khirnov.net>2016-10-16 20:27:30 +0200
commit8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4 (patch)
tree9bad99ec03a48d9d04a7c8f35240e5f2694a3c30 /libavformat/internal.h
parent89b35a139e838deeb32ec20d8d034c81014401d0 (diff)
downloadffmpeg-streaming-8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4.zip
ffmpeg-streaming-8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4.tar.gz
lavf: use the new bitstream filter for extracting extradata
This also fixes a minor bug introduced in the codecpar conversion, where the termination condition for extracting the extradata does not match the actual extradata setting code. As a result, the packet durations made up by lavf go back to their values before the codecpar conversion. That is of little consequence since that code should eventually be dropped completely.
Diffstat (limited to 'libavformat/internal.h')
-rw-r--r--libavformat/internal.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h
index de55af5..52cd29b 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -113,6 +113,15 @@ struct AVStreamInternal {
enum AVCodecID orig_codec_id;
+ /* the context for extracting extradata in find_stream_info()
+ * inited=1/bsf=NULL signals that extracting is not possible (codec not
+ * supported) */
+ struct {
+ AVBSFContext *bsf;
+ AVPacket *pkt;
+ int inited;
+ } extract_extradata;
+
#if FF_API_LAVF_AVCTX
// whether the deprecated stream codec context needs
// to be filled from the codec parameters
OpenPOWER on IntegriCloud