vice-gtkglext/ffmpeg.patch

   1 diff -Naur vice-2.3-orig/src/gfxoutputdrv/ffmpegdrv.c vice-2.3/src/gfxoutputdrv/ffmpegdrv.c
   2 --- vice-2.3-orig/src/gfxoutputdrv/ffmpegdrv.c  2011-11-28 22:41:20.204389694 -0500
   3 +++ vice-2.3/src/gfxoutputdrv/ffmpegdrv.c       2011-11-28 22:47:48.396209074 -0500
   4 @@ -342,7 +342,7 @@
   5
   6      c = st->codec;
   7      c->codec_id = ffmpegdrv_fmt->audio_codec;
   8 -    c->codec_type = CODEC_TYPE_AUDIO;
   9 +    c->codec_type = AVMEDIA_TYPE_AUDIO;
  10      c->sample_fmt = SAMPLE_FMT_S16;
  11
  12      /* put sample parameters */
  13 @@ -370,7 +370,7 @@
  14          pkt.size = (*ffmpeglib.p_avcodec_encode_audio)(c,
  15                          audio_outbuf, audio_outbuf_size, audio_in->buffer);
  16          pkt.pts = c->coded_frame->pts;
  17 -        pkt.flags |= PKT_FLAG_KEY;
  18 +        pkt.flags |= AV_PKT_FLAG_KEY;
  19          pkt.stream_index = audio_st->index;
  20          pkt.data = audio_outbuf;
  21
  22 @@ -559,7 +559,7 @@
  23
  24      c = st->codec;
  25      c->codec_id = ffmpegdrv_fmt->video_codec;
  26 -    c->codec_type = CODEC_TYPE_VIDEO;
  27 +    c->codec_type = AVMEDIA_TYPE_VIDEO;
  28
  29      /* put sample parameters */
  30      c->bit_rate = video_bitrate;
  31 @@ -819,7 +819,7 @@
  32      if (ffmpegdrv_oc->oformat->flags & AVFMT_RAWPICTURE) {
  33          AVPacket pkt;
  34          (*ffmpeglib.p_av_init_packet)(&pkt);
  35 -        pkt.flags |= PKT_FLAG_KEY;
  36 +        pkt.flags |= AV_PKT_FLAG_KEY;
  37          pkt.stream_index = video_st->index;
  38          pkt.data = (uint8_t*)picture;
  39          pkt.size = sizeof(AVPicture);
  40 @@ -840,7 +840,7 @@
  41              (*ffmpeglib.p_av_init_packet)(&pkt);
  42              pkt.pts = c->coded_frame->pts;
  43              if (c->coded_frame->key_frame)
  44 -                pkt.flags |= PKT_FLAG_KEY;
  45 +                pkt.flags |= AV_PKT_FLAG_KEY;
  46              pkt.stream_index = video_st->index;
  47              pkt.data = video_outbuf;
  48              pkt.size = out_size;