1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
Description: Replace deprecated FFmpeg API
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Last-Update: <2015-11-28>
--- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c
+++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c
@@ -153,7 +153,7 @@ seek_cb (void *opaque,
static size_t
create_thumbnail (int src_width, int src_height,
int src_stride[],
- enum PixelFormat src_pixfmt,
+ enum AVPixelFormat src_pixfmt,
const uint8_t * const src_data[],
int dst_width, int dst_height,
uint8_t **output_data,
@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src
if (NULL ==
(scaler_ctx =
sws_getContext (src_width, src_height, src_pixfmt,
- dst_width, dst_height, PIX_FMT_RGB24,
+ dst_width, dst_height, AV_PIX_FMT_RGB24,
SWS_BILINEAR, NULL, NULL, NULL)))
{
#if DEBUG
@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src
return 0;
}
if (NULL == (dst_buffer =
- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
+ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
{
#if DEBUG
fprintf (stderr,
@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src
return 0;
}
avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
- PIX_FMT_RGB24, dst_width, dst_height);
+ AV_PIX_FMT_RGB24, dst_width, dst_height);
sws_scale (scaler_ctx,
src_data,
src_stride,
@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src
}
encoder_codec_ctx->width = dst_width;
encoder_codec_ctx->height = dst_height;
- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
+ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
opts = NULL;
if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
{
|
GitWeb
