libextractor/trunk/ffmpeg5.patch

   1 diff --git a/src/plugins/thumbnailffmpeg_extractor.c b/src/plugins/thumbnailffmpeg_extractor.c
   2 index ef7a05f..f2c5c94 100644
   3 --- a/src/plugins/thumbnailffmpeg_extractor.c
   4 +++ b/src/plugins/thumbnailffmpeg_extractor.c
   5 @@ -181,7 +181,7 @@ create_thumbnail (AVCodecContext *pCodecCtx, int src_width, int src_height,
   6  {
   7    AVCodecContext *encoder_codec_ctx;
   8    AVDictionary *opts;
   9 -  AVCodec *encoder_codec;
  10 +  const AVCodec *encoder_codec;
  11    struct SwsContext *scaler_ctx;
  12    AVFrame *dst_frame;
  13    uint8_t *dst_buffer;
  14 @@ -332,12 +332,12 @@ create_thumbnail (AVCodecContext *pCodecCtx, int src_width, int src_height,
  15    dst_frame->quality = encoder_codec_ctx->global_quality;
  16  #endif
  17
  18 -  err = avcodec_encode_video2 (encoder_codec_ctx,
  19 -                               &pkt,
  20 -                               dst_frame, &gotPacket);
  21 -
  22 +  err = avcodec_send_frame(encoder_codec_ctx, dst_frame);
  23    if (err < 0)
  24      goto cleanup;
  25 +  err = avcodec_receive_packet(encoder_codec_ctx, &pkt);
  26 +  if (err < 0 && err != AVERROR(EAGAIN))
  27 +    goto cleanup;
  28    err = pkt.size;
  29    memcpy (encoder_output_buffer,pkt.data, pkt.size);
  30
  31 @@ -417,7 +417,7 @@ extract_image (ENUM_CODEC_ID image_codec_id,
  32  {
  33    AVDictionary *opts;
  34    AVCodecContext *codec_ctx;
  35 -  AVCodec *codec;
  36 +  const AVCodec *codec;
  37    AVPacket avpkt;
  38    AVFrame *frame;
  39    uint8_t *encoded_thumbnail;
  40 @@ -480,7 +480,14 @@ extract_image (ENUM_CODEC_ID image_codec_id,
  41      av_init_packet (&avpkt);
  42      avpkt.data = padded_data;
  43      avpkt.size = iret;
  44 -    avcodec_decode_video2 (codec_ctx, frame, &frame_finished, &avpkt);
  45 +    int ret = avcodec_send_packet(codec_ctx, &avpkt);
  46 +    if (ret < 0)
  47 +        break;
  48 +    ret = avcodec_receive_frame(codec_ctx, frame);
  49 +    if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
  50 +        break;
  51 +    if (ret >= 0)
  52 +        frame_finished = 1;
  53    }
  54    if (! frame_finished)
  55    {
  56 @@ -553,7 +560,7 @@ extract_video (struct EXTRACTOR_ExtractContext *ec)
  57    struct AVFormatContext *format_ctx;
  58    AVCodecContext *codec_ctx;
  59    AVCodecParameters *codecpar;
  60 -  AVCodec *codec;
  61 +  const AVCodec *codec;
  62    AVDictionary *options;
  63    AVFrame *frame;
  64    uint8_t *encoded_thumbnail;
  65 @@ -607,7 +614,8 @@ extract_video (struct EXTRACTOR_ExtractContext *ec)
  66    for (i = 0; i<format_ctx->nb_streams; i++)
  67    {
  68      codecpar = format_ctx->streams[i]->codecpar;
  69 -    codec_ctx = format_ctx->streams[i]->codec;
  70 +    codec_ctx = avcodec_alloc_context3(avcodec_find_decoder(codecpar->codec_id));
  71 +    avcodec_parameters_to_context(codec_ctx, codecpar);
  72      if (AVMEDIA_TYPE_VIDEO != codec_ctx->codec_type)
  73        continue;
  74      if (NULL == (codec = avcodec_find_decoder (codecpar->codec_id)))
  75 @@ -682,10 +690,14 @@ extract_video (struct EXTRACTOR_ExtractContext *ec)
  76        break;
  77      if (packet.stream_index == video_stream_index)
  78      {
  79 -      avcodec_decode_video2 (codec_ctx,
  80 -                             frame,
  81 -                             &frame_finished,
  82 -                             &packet);
  83 +      int ret = avcodec_send_packet(codec_ctx, &packet);
  84 +      if (ret < 0)
  85 +          break;
  86 +      ret = avcodec_receive_frame(codec_ctx, frame);
  87 +      if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF)
  88 +          break;
  89 +      if (ret >= 0)
  90 +          frame_finished = 1;
  91        if (frame_finished && frame->key_frame)
  92        {
  93          av_packet_unref (&packet);