diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-04 17:15:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-06 03:54:17 +0200 |
| commit | e813df4fa345684cc5a63da0510c14f197c9b732 (patch) | |
| tree | 192967d0635030c9ded4e28e25277482c8836930 /libavcodec/internal.h | |
| parent | 523205ce1ed9415183c162998c68f573479e78fe (diff) | |
| download | ffmpeg-streaming-e813df4fa345684cc5a63da0510c14f197c9b732.zip ffmpeg-streaming-e813df4fa345684cc5a63da0510c14f197c9b732.tar.gz | |
avcodec: Avoid splitting side data repeatedly
Fixes Timeout
Fixes: 508/clusterfuzz-testcase-6245747678773248
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/internal.h')
| -rw-r--r-- | libavcodec/internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index e30d4aa..6519528 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -356,6 +356,10 @@ int ff_set_sar(AVCodecContext *avctx, AVRational sar); int ff_side_data_update_matrix_encoding(AVFrame *frame, enum AVMatrixEncoding matrix_encoding); +#if FF_API_MERGE_SD +int ff_packet_split_and_drop_side_data(AVPacket *pkt); +#endif + /** * Select the (possibly hardware accelerated) pixel format. * This is a wrapper around AVCodecContext.get_format() and should be used |
