aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-03-04 15:51:41 -0300
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-03-31 21:20:39 +0100
commit3fafde6cbe345d2f84cfe61b94d4a823990969b3 (patch)
tree51e21400ffe44edb735fe5300615630764726ada /libavcodec
parente6053b3b19c070e994a501fe0cc20255d15c4aa8 (diff)
downloadffmpeg-3fafde6cbe345d2f84cfe61b94d4a823990969b3.tar.gz
lavc: Add seek_preroll to AVCodecParameters
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h4
-rw-r--r--libavcodec/utils.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 0d37083ee2..4e8d30c6b0 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3904,6 +3904,10 @@ typedef struct AVCodecParameters {
* audio without any trailing padding.
*/
int trailing_padding;
+ /**
+ * Audio only. Number of samples to skip after a discontinuity.
+ */
+ int seek_preroll;
} AVCodecParameters;
/**
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index d38e2f927f..55a13799e5 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3784,6 +3784,7 @@ int avcodec_parameters_from_context(AVCodecParameters *par,
par->sample_rate = codec->sample_rate;
par->block_align = codec->block_align;
par->initial_padding = codec->initial_padding;
+ par->seek_preroll = codec->seek_preroll;
break;
}
@@ -3830,6 +3831,7 @@ int avcodec_parameters_to_context(AVCodecContext *codec,
codec->sample_rate = par->sample_rate;
codec->block_align = par->block_align;
codec->initial_padding = par->initial_padding;
+ codec->seek_preroll = par->seek_preroll;
break;
}