diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-07-12 22:31:44 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-07-12 22:31:44 +0200 |
commit | 9175d09f1312a1495c287c6d0d45da675e359b1c (patch) | |
tree | 0d034320c809932a46183478aef834f1cc62d3eb | |
parent | f033468cd36e2b8bf92d747fbd683b2ace8da394 (diff) | |
download | libextractor-9175d09f1312a1495c287c6d0d45da675e359b1c.tar.gz libextractor-9175d09f1312a1495c287c6d0d45da675e359b1c.zip |
fix #888373
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | src/plugins/thumbnailffmpeg_extractor.c | 12 |
2 files changed, 12 insertions, 1 deletions
@@ -1,5 +1,6 @@ | |||
1 | Thu Jul 12 22:26:36 CEST 2018 | 1 | Thu Jul 12 22:26:36 CEST 2018 |
2 | Fix potential infinite loop in mpeg extractor. | 2 | Fix potential infinite loop in mpeg extractor. |
3 | Fix build issue with FFmpeg 4.0 (Debian #888373). | ||
3 | Releasing GNU libextractor 1.7. -CG | 4 | Releasing GNU libextractor 1.7. -CG |
4 | 5 | ||
5 | Thu Jul 12 21:23:43 CEST 2018 | 6 | Thu Jul 12 21:23:43 CEST 2018 |
diff --git a/src/plugins/thumbnailffmpeg_extractor.c b/src/plugins/thumbnailffmpeg_extractor.c index c2af240..1b7347a 100644 --- a/src/plugins/thumbnailffmpeg_extractor.c +++ b/src/plugins/thumbnailffmpeg_extractor.c | |||
@@ -107,7 +107,17 @@ | |||
107 | /** | 107 | /** |
108 | * Number of bytes to feed to libav in one go, with padding (padding is zeroed). | 108 | * Number of bytes to feed to libav in one go, with padding (padding is zeroed). |
109 | */ | 109 | */ |
110 | #ifdef AV_INPUT_BUFFER_PADDING_SIZE | ||
111 | #define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE) | ||
112 | #else | ||
113 | /* legacy */ | ||
110 | #define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) | 114 | #define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) |
115 | #endif | ||
116 | |||
117 | #ifndef AV_CODEC_FLAG_QSCALE | ||
118 | #define AV_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE | ||
119 | #endif | ||
120 | |||
111 | 121 | ||
112 | /** | 122 | /** |
113 | * Global handle to MAGIC data. | 123 | * Global handle to MAGIC data. |
@@ -355,7 +365,7 @@ create_thumbnail (AVCodecContext *pCodecCtx, int src_width, int src_height, | |||
355 | encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA; | 365 | encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA; |
356 | encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA; | 366 | encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA; |
357 | #endif | 367 | #endif |
358 | encoder_codec_ctx->flags = CODEC_FLAG_QSCALE; | 368 | encoder_codec_ctx->flags = AV_CODEC_FLAG_QSCALE; |
359 | encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA; | 369 | encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA; |
360 | 370 | ||
361 | dst_frame->pts = 1; | 371 | dst_frame->pts = 1; |