Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Mar 2023 14:56:44 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 190dd89650b4 - main - multimedia/libquicktime: Remove from tree
Message-ID:  <202303181456.32IEuiMg077077@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=190dd89650b4b9e058d5eac1ca10565a49a8484d

commit 190dd89650b4b9e058d5eac1ca10565a49a8484d
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-03-18 14:54:37 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-03-18 14:56:02 +0000

    multimedia/libquicktime: Remove from tree
    
    libquicktime is abandoned by upstream with last release over a
    decade ago and doesn't compile with newer versions of FFmpeg
---
 MOVED                                         |   1 +
 multimedia/Makefile                           |   1 -
 multimedia/libquicktime/Makefile              | 134 -----
 multimedia/libquicktime/distinfo              |   2 -
 multimedia/libquicktime/files/patch-ffmpeg29  | 343 -------------
 multimedia/libquicktime/files/patch-libav10   | 711 --------------------------
 multimedia/libquicktime/files/patch-z-ffmpeg4 | 307 -----------
 multimedia/libquicktime/pkg-descr             |   1 -
 multimedia/libquicktime/pkg-plist             |  36 --
 9 files changed, 1 insertion(+), 1535 deletions(-)

diff --git a/MOVED b/MOVED
index f7ccf601b0f8..c0f4c07dd8ae 100644
--- a/MOVED
+++ b/MOVED
@@ -17793,3 +17793,4 @@ net-p2p/openethereum||2023-03-15|Has expired: not maintained anymore
 devel/pydio-packr||2023-03-15|Was only used for building www/pydio-cells before, not needed anymore
 math/hs-penrose||2023-03-16|Perose Haskell app is deprecated upstrean, it was rewritten in TypeScript
 multimedia/libquicktime-lame||2023-03-18|Abandoned upstream and fails to build with newer versions of FFmpeg, consider using multimedia/ffmpeg
+multimedia/libquicktime||2023-03-18|Abandoned upstream and fails to build with newer versions of FFmpeg, consider using multimedia/ffmpeg
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 51b2c8181e5a..1958e2f13d0b 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -184,7 +184,6 @@
     SUBDIR += libmtp
     SUBDIR += libndi
     SUBDIR += libopenshot
-    SUBDIR += libquicktime
     SUBDIR += librav1e
     SUBDIR += librespot
     SUBDIR += librist
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
deleted file mode 100644
index c628d2a5cae3..000000000000
--- a/multimedia/libquicktime/Makefile
+++ /dev/null
@@ -1,134 +0,0 @@
-PORTNAME=	libquicktime
-PORTVERSION=	1.2.4
-PORTREVISION?=	33
-CATEGORIES=	multimedia
-MASTER_SITES=	SF
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Library for reading and writing quicktime files
-WWW=		http://libquicktime.sourceforge.net/
-
-.if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
-LIB_DEPENDS=	libvorbis.so:audio/libvorbis
-.endif
-
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USE_LDCONFIG=	yes
-USES=		cpe gettext gmake libtool pathfix pkgconfig
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lintl
-INSTALL_TARGET=	install-strip
-
-.if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
-USES+=		xorg
-USE_XORG=	xaw xv
-CONFIGURE_ARGS=	--with-x --enable-gpl --without-doxygen --without-lame \
-		--without-schroedinger
-
-OPTIONS_DEFINE=	ALSA DV FAAC FAAD FFMPEG GTK2 JPEG OPENGL OPTIMIZED_CFLAGS PNG \
-		X264 DOCS
-OPTIONS_DEFAULT=	FFMPEG JPEG OPENGL PNG X264
-OPTIONS_SUB=	yes
-
-PORTDOCS=	api_usage.html codecs.html
-
-.else
-CONFIGURE_ARGS+=	--without-x --enable-gpl --without-doxygen
-OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CONFIGURE_ARGS+=	--without-cpuflags
-.endif
-
-.if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
-.if ${PORT_OPTIONS:MGTK2}
-USES+=		gnome
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=	--with-gtk
-.else
-CONFIGURE_ARGS+=	--without-gtk
-.endif
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:audio/alsa-lib
-.else
-CONFIGURE_ARGS+=	--without-alsa
-.endif
-
-.if ${PORT_OPTIONS:MOPENGL}
-USES+=		gl
-USE_GL=		gl
-CONFIGURE_ARGS+=	--with-opengl
-.else
-CONFIGURE_ARGS+=	--without-opengl
-.endif
-
-.if ${PORT_OPTIONS:MDV}
-LIB_DEPENDS+=	libdv.so:multimedia/libdv
-CONFIGURE_ARGS+=	--with-libdv
-.else
-CONFIGURE_ARGS+=	--without-libdv
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-USES+=		jpeg
-CONFIGURE_ARGS+=	--with-libjpeg
-.else
-CONFIGURE_ARGS+=	--without-libjpeg
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+=	libpng.so:graphics/png
-CONFIGURE_ARGS+=	--with-libpng
-.else
-CONFIGURE_ARGS+=	--without-libpng
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	libavcodec.so:multimedia/ffmpeg
-CONFIGURE_ARGS+=	--with-ffmpeg
-.else
-CONFIGURE_ARGS+=	--without-ffmpeg
-.endif
-
-.if ${PORT_OPTIONS:MFAAC}
-LIB_DEPENDS+=	libfaac.so:audio/faac
-CONFIGURE_ARGS+=	--with-faac
-.else
-CONFIGURE_ARGS+=	--without-faac
-.endif
-
-.if ${PORT_OPTIONS:MFAAD}
-LIB_DEPENDS+=	libfaad.so:audio/faad
-CONFIGURE_ARGS+=	--with-faad2
-.else
-CONFIGURE_ARGS+=	--without-faad2
-.endif
-
-.if ${PORT_OPTIONS:MX264}
-LIB_DEPENDS+=	libx264.so:multimedia/libx264
-CONFIGURE_ARGS+=	--with-x264
-.else
-CONFIGURE_ARGS+=	--without-x264
-.endif
-
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/-DGTK_DISABLE_DEPRECATED//' ${WRKSRC}/configure
-
-.if ${PORT_OPTIONS:MDOCS} && !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/multimedia/libquicktime/distinfo b/multimedia/libquicktime/distinfo
deleted file mode 100644
index 9591760db9f1..000000000000
--- a/multimedia/libquicktime/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (libquicktime-1.2.4.tar.gz) = 1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368
-SIZE (libquicktime-1.2.4.tar.gz) = 1028626
diff --git a/multimedia/libquicktime/files/patch-ffmpeg29 b/multimedia/libquicktime/files/patch-ffmpeg29
deleted file mode 100644
index 8abed6291b61..000000000000
--- a/multimedia/libquicktime/files/patch-ffmpeg29
+++ /dev/null
@@ -1,343 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Last-Update: <2015-11-02>
-
---- plugins/ffmpeg/audio.c.orig
-+++ plugins/ffmpeg/audio.c
-@@ -1267,7 +1267,7 @@ static int lqt_ffmpeg_encode_audio(quick
-     pkt.data = codec->chunk_buffer;
-     pkt.size = codec->chunk_buffer_alloc;
- 
--    avcodec_get_frame_defaults(&f);
-+    av_frame_unref(&f);
-     f.nb_samples = codec->avctx->frame_size;
-     
-     avcodec_fill_audio_frame(&f, channels, codec->avctx->sample_fmt,
---- plugins/ffmpeg/params.c.orig
-+++ plugins/ffmpeg/params.c
-@@ -158,7 +158,6 @@ enum_t coder_type[] =
-     { "Arithmetic",           FF_CODER_TYPE_AC },
-     { "Raw",                  FF_CODER_TYPE_RAW },
-     { "RLE",                  FF_CODER_TYPE_RLE },
--    { "Deflate",              FF_CODER_TYPE_DEFLATE },
-   };
- 
- #define PARAM_ENUM(name, var, arr) \
-@@ -253,15 +252,13 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_INT("ff_me_penalty_compensation",me_penalty_compensation);
-   PARAM_INT("ff_bidir_refine",bidir_refine);
-   PARAM_INT("ff_brd_scale",brd_scale);
--  PARAM_INT("ff_scenechange_factor",scenechange_factor);
-   PARAM_FLAG("ff_flag_qscale",CODEC_FLAG_QSCALE);
-   PARAM_FLAG("ff_flag_4mv",CODEC_FLAG_4MV);
-   PARAM_FLAG("ff_flag_qpel",CODEC_FLAG_QPEL);
--  PARAM_FLAG("ff_flag_gmc",CODEC_FLAG_GMC);
-+  PARAM_DICT_FLAG("ff_flag_gmc", "gmc");
-   PARAM_FLAG("ff_flag_mv0",CODEC_FLAG_MV0);
-   //  PARAM_FLAG("ff_flag_part",CODEC_FLAG_PART); // Unused
-   PARAM_FLAG("ff_flag_gray",CODEC_FLAG_GRAY);
--  PARAM_FLAG("ff_flag_emu_edge",CODEC_FLAG_EMU_EDGE);
-   PARAM_FLAG("ff_flag_normalize_aqp",CODEC_FLAG_NORMALIZE_AQP);
-   //  PARAM_FLAG("ff_flag_alt_scan",CODEC_FLAG_ALT_SCAN); // Unused
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
---- plugins/ffmpeg/params.h.orig
-+++ plugins/ffmpeg/params.h
-@@ -149,7 +149,7 @@ the reference. Unused for constant quant
-     .type =        LQT_PARAMETER_INT, \
-     .val_default = { .val_int = 0 }, \
-     .val_min =     { .val_int = 0 }, \
--    .val_max =     { .val_int = FF_MAX_B_FRAMES }, \
-+    .val_max =     { .val_int = INT_MAX }, \
-     .help_string = TRS("Maximum number of B-frames between non B-frames") \
-   }
- 
---- plugins/ffmpeg/video.c.orig
-+++ plugins/ffmpeg/video.c
-@@ -37,10 +37,10 @@
- #endif
- 
- 
--#ifdef  PIX_FMT_YUV422P10
--#define PIX_FMT_YUV422P10_OR_DUMMY PIX_FMT_YUV422P10
-+#ifdef  AV_PIX_FMT_YUV422P10
-+#define AV_PIX_FMT_YUV422P10_OR_DUMMY AV_PIX_FMT_YUV422P10
- #else
--#define PIX_FMT_YUV422P10_OR_DUMMY -1234
-+#define AV_PIX_FMT_YUV422P10_OR_DUMMY -1234
- #endif
- 
- #if LIBAVCODEC_VERSION_INT >= ((54<<16)|(1<<8)|0)
-@@ -90,9 +90,9 @@ typedef struct
-   int imx_bitrate;
-   int imx_strip_vbi;
- 
--  /* In some cases FFMpeg would report something like PIX_FMT_YUV422P, while
--     we would like to treat it as PIX_FMT_YUVJ422P. It's only used for decoding */
--  enum PixelFormat reinterpret_pix_fmt;
-+  /* In some cases FFMpeg would report something like AV_PIX_FMT_YUV422P, while
-+     we would like to treat it as AV_PIX_FMT_YUVJ422P. It's only used for decoding */
-+  enum AVPixelFormat reinterpret_pix_fmt;
-   
-   int is_imx;
-   int y_offset;
-@@ -137,42 +137,42 @@ typedef struct
- 
- static const struct
-   {
--  enum PixelFormat ffmpeg_id;
-+  enum AVPixelFormat ffmpeg_id;
-   int              lqt_id;
-   int              exact;
-   }
- colormodels[] =
-   {
--    { PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
-+    { AV_PIX_FMT_YUV420P,   BC_YUV420P,   1 }, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples)
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--    { PIX_FMT_YUV422,    BC_YUV422,    1 },
-+    { AV_PIX_FMT_YUV422,    BC_YUV422,    1 },
- #else
--    { PIX_FMT_YUYV422,   BC_YUV422,    1 },
-+    { AV_PIX_FMT_YUYV422,   BC_YUV422,    1 },
- #endif
--    { PIX_FMT_RGB24,     BC_RGB888,    1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
--    { PIX_FMT_BGR24,     BC_BGR888,    1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
--    { PIX_FMT_YUV422P,   BC_YUV422P,   1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
--    { PIX_FMT_YUV444P,   BC_YUV444P,   1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
--    { PIX_FMT_YUV411P,   BC_YUV411P,   1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
--    { PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
--#ifdef PIX_FMT_YUV422P10
--    { PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
--#endif
--    { PIX_FMT_RGB565,    BC_RGB565,    1 }, ///< always stored in cpu endianness
--    { PIX_FMT_YUVJ420P,  BC_YUVJ420P,  1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
--    { PIX_FMT_YUVJ422P,  BC_YUVJ422P,  1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
--    { PIX_FMT_YUVJ444P,  BC_YUVJ444P,  1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
-+    { AV_PIX_FMT_RGB24,     BC_RGB888,    1 }, ///< Packed pixel, 3 bytes per pixel, RGBRGB...
-+    { AV_PIX_FMT_BGR24,     BC_BGR888,    1 }, ///< Packed pixel, 3 bytes per pixel, BGRBGR...
-+    { AV_PIX_FMT_YUV422P,   BC_YUV422P,   1 }, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
-+    { AV_PIX_FMT_YUV444P,   BC_YUV444P,   1 }, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples)
-+    { AV_PIX_FMT_YUV411P,   BC_YUV411P,   1 }, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples)
-+    { AV_PIX_FMT_YUV422P16, BC_YUV422P16, 1 }, ///< Planar 16 bit YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples)
-+#ifdef AV_PIX_FMT_YUV422P10
-+    { AV_PIX_FMT_YUV422P10, BC_YUV422P10, 1 }, ///< 10 bit samples in uint16_t containers, planar 4:2:2
-+#endif
-+    { AV_PIX_FMT_RGB565,    BC_RGB565,    1 }, ///< always stored in cpu endianness
-+    { AV_PIX_FMT_YUVJ420P,  BC_YUVJ420P,  1 }, ///< Planar YUV 4:2:0 full scale (jpeg)
-+    { AV_PIX_FMT_YUVJ422P,  BC_YUVJ422P,  1 }, ///< Planar YUV 4:2:2 full scale (jpeg)
-+    { AV_PIX_FMT_YUVJ444P,  BC_YUVJ444P,  1 }, ///< Planar YUV 4:4:4 full scale (jpeg)
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--    { PIX_FMT_RGBA32,    BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
-+    { AV_PIX_FMT_RGBA32,    BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
- #else
--    { PIX_FMT_RGB32,     BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
-+    { AV_PIX_FMT_RGB32,     BC_RGBA8888,  0 }, ///< Packed pixel, 4 bytes per pixel, BGRABGRA...
- #endif
--    { PIX_FMT_RGB555,    BC_RGB888,    0 }, ///< always stored in cpu endianness, most significant bit to 1
--    { PIX_FMT_GRAY8,     BC_RGB888,    0 },
--    { PIX_FMT_MONOWHITE, BC_RGB888,    0 }, ///< 0 is white
--    { PIX_FMT_MONOBLACK, BC_RGB888,    0 }, ///< 0 is black
--    { PIX_FMT_PAL8,      BC_RGB888,    0 }, ///< 8 bit with RGBA palette
--    { PIX_FMT_YUV410P,   BC_YUV420P,   0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
-+    { AV_PIX_FMT_RGB555,    BC_RGB888,    0 }, ///< always stored in cpu endianness, most significant bit to 1
-+    { AV_PIX_FMT_GRAY8,     BC_RGB888,    0 },
-+    { AV_PIX_FMT_MONOWHITE, BC_RGB888,    0 }, ///< 0 is white
-+    { AV_PIX_FMT_MONOBLACK, BC_RGB888,    0 }, ///< 0 is black
-+    { AV_PIX_FMT_PAL8,      BC_RGB888,    0 }, ///< 8 bit with RGBA palette
-+    { AV_PIX_FMT_YUV410P,   BC_YUV420P,   0 }, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples)
-   };
- 
- static const struct
-@@ -248,7 +248,7 @@ static int lqt_ffmpeg_delete_video(quick
-   if(codec->frame_buffer) free(codec->frame_buffer);
-   if(codec->buffer) free(codec->buffer);
- 
--  if(codec->frame) av_free(codec->frame);
-+  if(codec->frame) av_frame_free(&codec->frame);
- 
- #ifdef HAVE_LIBSWSCALE
-   if(codec->swsContext)
-@@ -343,16 +343,16 @@ static int lqt_tenbit_dnxhd_supported(AV
-   if (!codec->pix_fmts)
-     return 0;
- 
--  for (i = 0; codec->pix_fmts[i] != PIX_FMT_NONE; ++i)
-+  for (i = 0; codec->pix_fmts[i] != AV_PIX_FMT_NONE; ++i)
-     {
--    if (codec->pix_fmts[i] == PIX_FMT_YUV422P10_OR_DUMMY)
-+    if (codec->pix_fmts[i] == AV_PIX_FMT_YUV422P10_OR_DUMMY)
-       return 1;
-     }
- 
-   return 0;
-   }
- 
--static enum PixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
-+static enum AVPixelFormat lqt_ffmpeg_get_ffmpeg_colormodel(int id)
-   {
-   int i;
- 
-@@ -361,10 +361,10 @@ static enum PixelFormat lqt_ffmpeg_get_f
-     if(colormodels[i].lqt_id == id)
-       return colormodels[i].ffmpeg_id;
-     }
--  return PIX_FMT_NB;
-+  return AV_PIX_FMT_NB;
-   }
- 
--static int lqt_ffmpeg_get_lqt_colormodel(enum PixelFormat id, int * exact)
-+static int lqt_ffmpeg_get_lqt_colormodel(enum AVPixelFormat id, int * exact)
-   {
-   int i;
- 
-@@ -402,24 +402,24 @@ static void lqt_ffmpeg_setup_decoding_co
-   /* First we try codec-specific colormodel matching. */
-   if(codec->decoder->id == AV_CODEC_ID_DNXHD)
-     {
--    /* FFMpeg supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10 for DNxHD, which
--       we sometimes interpret as PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10. */
--    if (codec->avctx->pix_fmt == PIX_FMT_YUV422P || codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY)
-+    /* FFMpeg supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10 for DNxHD, which
-+       we sometimes interpret as AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10. */
-+    if (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P || codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY)
-       {
--      int p10 = (codec->avctx->pix_fmt == PIX_FMT_YUV422P10_OR_DUMMY);
-+      int p10 = (codec->avctx->pix_fmt == AV_PIX_FMT_YUV422P10_OR_DUMMY);
-       *exact = 1;
-       if (lqt_ffmpeg_get_avid_yuv_range(vtrack->track) == AVID_FULL_YUV_RANGE)
-         {
-         vtrack->stream_cmodel = p10 ? BC_YUVJ422P10 : BC_YUVJ422P;
--        codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUVJ422P;
--        // Note: reinterpret_pix_fmt should really be PIX_FMT_YUVJ422P10, except
-+        codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUVJ422P;
-+        // Note: reinterpret_pix_fmt should really be AV_PIX_FMT_YUVJ422P10, except
-         // there is no such colormodel in FFMpeg. Fortunately, it's not a problem
-         // in this case, as reinterpret_pix_fmt is only used when *exact == 0.
-         }
-       else
-         {
-         vtrack->stream_cmodel = p10 ? BC_YUV422P10 : BC_YUV422P;
--        codec->reinterpret_pix_fmt = p10 ? PIX_FMT_YUV422P10_OR_DUMMY : PIX_FMT_YUV422P;
-+        codec->reinterpret_pix_fmt = p10 ? AV_PIX_FMT_YUV422P10_OR_DUMMY : AV_PIX_FMT_YUV422P;
-         }
-       return;
-       }
-@@ -440,14 +440,14 @@ static void lqt_ffmpeg_setup_encoding_co
- 
-   if (codec->encoder->id == AV_CODEC_ID_DNXHD)
-     {
--    /* FFMpeg's DNxHD encoder only supports PIX_FMT_YUV422P and PIX_FMT_YUV422P10
--       and doesn't know anything about PIX_FMT_YUVJ422P and PIX_FMT_YUVJ422P10
-+    /* FFMpeg's DNxHD encoder only supports AV_PIX_FMT_YUV422P and AV_PIX_FMT_YUV422P10
-+       and doesn't know anything about AV_PIX_FMT_YUVJ422P and AV_PIX_FMT_YUVJ422P10
-        (in fact, the latter doesn't even exist) */
--    codec->avctx->pix_fmt = PIX_FMT_YUV422P;
-+    codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P;
-     if (vtrack->stream_cmodel == BC_YUV422P10 || vtrack->stream_cmodel == BC_YUVJ422P10)
-       {
-       if (lqt_tenbit_dnxhd_supported(codec->encoder))
--        codec->avctx->pix_fmt = PIX_FMT_YUV422P10_OR_DUMMY;
-+        codec->avctx->pix_fmt = AV_PIX_FMT_YUV422P10_OR_DUMMY;
-       }
-     }
-   }
-@@ -458,7 +458,7 @@ static void lqt_ffmpeg_setup_encoding_co
- /* From avcodec.h: */
- 
- /*
-- * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
-+ * AV_PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA
-  * color is put together as:
-  *  (A << 24) | (R << 16) | (G << 8) | B
-  * This is stored as BGRA on little endian CPU architectures and ARGB on
-@@ -530,7 +530,7 @@ static void convert_rgba_to_argb(uint8_t
-  */
- 
- static void convert_image_decode(quicktime_ffmpeg_video_codec_t *codec,
--                                 AVFrame * in_frame, enum PixelFormat in_format,
-+                                 AVFrame * in_frame, enum AVPixelFormat in_format,
-                                  unsigned char ** out_frame, int out_format,
-                                  int width, int height, int row_span, int row_span_uv)
-   {
-@@ -547,9 +547,9 @@ static void convert_image_decode(quickti
-    *  RGBA format like in ffmpeg??
-    */
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--  if((in_format == PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
-+  if((in_format == AV_PIX_FMT_RGBA32) && (out_format == BC_RGBA8888))
- #else
--    if((in_format == PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
-+    if((in_format == AV_PIX_FMT_RGB32) && (out_format == BC_RGBA8888))
- #endif
-       {
-       convert_image_decode_rgba(in_frame, out_frame, width, height, codec->y_offset);
-@@ -829,7 +829,7 @@ static int lqt_ffmpeg_decode_video(quick
-     if(avcodec_open2(codec->avctx, codec->decoder, NULL) != 0)
-       return -1;
- #endif
--    codec->frame = avcodec_alloc_frame();
-+    codec->frame = av_frame_alloc();
-     vtrack->stream_cmodel = LQT_COLORMODEL_NONE;
-     codec->initialized = 1;
-     }
-@@ -929,10 +929,10 @@ static int lqt_ffmpeg_decode_video(quick
- #ifdef HAVE_LIBSWSCALE
- 
- #if LIBAVUTIL_VERSION_INT < (50<<16)
--      if(!((codec->avctx->pix_fmt == PIX_FMT_RGBA32) &&
-+      if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGBA32) &&
-            (vtrack->stream_cmodel == BC_RGBA8888)))
- #else
--        if(!((codec->avctx->pix_fmt == PIX_FMT_RGB32) &&
-+        if(!((codec->avctx->pix_fmt == AV_PIX_FMT_RGB32) &&
-              (vtrack->stream_cmodel == BC_RGBA8888)))
- #endif
-           {
-@@ -1318,7 +1318,7 @@ static int lqt_ffmpeg_encode_video(quick
-         
-   if(!codec->initialized)
-     {
--    codec->frame = avcodec_alloc_frame();
-+    codec->frame = av_frame_alloc();
- 
-     /* time_base is 1/framerate for constant framerate */
-           
-@@ -1396,9 +1396,9 @@ static int lqt_ffmpeg_encode_video(quick
-       if(vtrack->stream_cmodel == BC_RGBA8888)
-         {
-         /* Libquicktime doesn't natively support a color model equivalent
--           to PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
-+           to AV_PIX_FMT_ARGB, which is required for QTRLE with alpha channel.
-            So, we use BC_RGBA8888 and do ad hoc conversion below. */
--        codec->avctx->pix_fmt = PIX_FMT_ARGB;
-+        codec->avctx->pix_fmt = AV_PIX_FMT_ARGB;
-         vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32;
-         }
-       }
-@@ -1467,7 +1467,7 @@ static int lqt_ffmpeg_encode_video(quick
-     }
-   //        codec->lqt_colormodel = ffmepg_2_lqt(codec->com.ffcodec_enc);
- 
--  if(codec->y_offset != 0 || codec->avctx->pix_fmt == PIX_FMT_ARGB)
-+  if(codec->y_offset != 0 || codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
-     {
-     if(!codec->tmp_rows)
-       {
-@@ -1492,7 +1492,7 @@ static int lqt_ffmpeg_encode_video(quick
-                         vtrack->stream_cmodel,
-                         0, 0, 0, codec->y_offset);
-       }
--    else if(codec->avctx->pix_fmt == PIX_FMT_ARGB)
-+    else if(codec->avctx->pix_fmt == AV_PIX_FMT_ARGB)
-       {
-       convert_rgba_to_argb(row_pointers[0], vtrack->stream_row_span,
-                            codec->tmp_rows[0], codec->tmp_row_span,
-@@ -1600,7 +1600,7 @@ static int lqt_ffmpeg_encode_video(quick
-       {
-       int advanced = 0;
-       if(codec->avctx->max_b_frames ||
--         (codec->avctx->flags & (CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
-+         (codec->avctx->flags & (AV_CODEC_FLAG_QPEL|CODEC_FLAG_GMC)))
-         advanced = 1;
- 
-       setup_header_mpeg4(file, track, codec->avctx->extradata,
diff --git a/multimedia/libquicktime/files/patch-libav10 b/multimedia/libquicktime/files/patch-libav10
deleted file mode 100644
index d884a6db2f54..000000000000
--- a/multimedia/libquicktime/files/patch-libav10
+++ /dev/null
@@ -1,711 +0,0 @@
-Description: build against libav10 (Closes: #739325)
-Author: Reinhard Tartler <siretart@tauware.de>
-Bug-Debian: http://bugs.debian.org/739325
-Last-Update: 2014-03-16
-
-
---- plugins/ffmpeg/lqt_ffmpeg.c.orig
-+++ plugins/ffmpeg/lqt_ffmpeg.c
-@@ -386,7 +386,7 @@ static lqt_image_size_static_t image_siz
- struct CODECIDMAP codecidmap_v[] =
-   {
-     {
--      .id = CODEC_ID_MPEG1VIDEO,
-+      .id = AV_CODEC_ID_MPEG1VIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -397,7 +397,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE }
-     },
-     {
--      .id = CODEC_ID_MPEG4,
-+      .id = AV_CODEC_ID_MPEG4,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -415,7 +415,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .compression_id = LQT_COMPRESSION_MPEG4_ASP,
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V1,
-+      .id = AV_CODEC_ID_MSMPEG4V1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -426,7 +426,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V2,
-+      .id = AV_CODEC_ID_MSMPEG4V2,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -437,7 +437,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V3,
-+      .id = AV_CODEC_ID_MSMPEG4V3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -453,7 +453,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_MSMPEG4V3,
-+      .id = AV_CODEC_ID_MSMPEG4V3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -468,7 +468,7 @@ struct CODECIDMAP codecidmap_v[] =
-     },
- #if 0
-     {
--      .id = CODEC_ID_WMV1,
-+      .id = AV_CODEC_ID_WMV1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -481,7 +481,7 @@ struct CODECIDMAP codecidmap_v[] =
-     },
- #endif
-     {
--      .id = CODEC_ID_H263,
-+      .id = AV_CODEC_ID_H263,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -493,7 +493,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .compatibility_flags = LQT_FILE_QT_OLD | LQT_FILE_QT | LQT_FILE_MP4 | LQT_FILE_3GP,
-     },
-     {
--      .id = CODEC_ID_H263,
-+      .id = AV_CODEC_ID_H263,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -508,7 +508,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_H264,
-+      .id = AV_CODEC_ID_H264,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -519,7 +519,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_H263P,
-+      .id = AV_CODEC_ID_H263P,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -533,7 +533,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_H263I,
-+      .id = AV_CODEC_ID_H263I,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -544,7 +544,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_SVQ1,
-+      .id = AV_CODEC_ID_SVQ1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -555,7 +555,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_SVQ3,
-+      .id = AV_CODEC_ID_SVQ3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -566,7 +566,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MJPEG,
-+      .id = AV_CODEC_ID_MJPEG,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -580,7 +580,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .do_encode = 1,
-     },
-     {
--      .id = CODEC_ID_MJPEGB,
-+      .id = AV_CODEC_ID_MJPEGB,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -594,7 +594,7 @@ struct CODECIDMAP codecidmap_v[] =
-     },
- #if LIBAVCODEC_BUILD >= 3346688
-     {
--      .id = CODEC_ID_TARGA,
-+      .id = AV_CODEC_ID_TARGA,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -606,7 +606,7 @@ struct CODECIDMAP codecidmap_v[] =
- #endif
- #if LIBAVCODEC_BUILD >= 3347456
-     {
--      .id = CODEC_ID_TIFF,
-+      .id = AV_CODEC_ID_TIFF,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -617,7 +617,7 @@ struct CODECIDMAP codecidmap_v[] =
-     },
- #endif
-     {
--      .id = CODEC_ID_8BPS,
-+      .id = AV_CODEC_ID_8BPS,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -627,7 +627,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_INDEO3,
-+      .id = AV_CODEC_ID_INDEO3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -638,7 +638,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_RPZA,
-+      .id = AV_CODEC_ID_RPZA,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -648,7 +648,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_SMC,
-+      .id = AV_CODEC_ID_SMC,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -658,7 +658,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_CINEPAK,
-+      .id = AV_CODEC_ID_CINEPAK,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -669,7 +669,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_CYUV,
-+      .id = AV_CODEC_ID_CYUV,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -680,7 +680,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_QTRLE,
-+      .id = AV_CODEC_ID_QTRLE,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -693,7 +693,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .encoding_colormodels = (int[]){ BC_RGB888, BC_RGBA8888, LQT_COLORMODEL_NONE },
-     },
-     {
--      .id = CODEC_ID_MSRLE,
-+      .id = AV_CODEC_ID_MSRLE,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -703,7 +703,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .wav_ids = { LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -719,7 +719,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .image_sizes = image_sizes_dv,
-     },
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -735,7 +735,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .image_sizes = image_sizes_dv,
-     },
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -751,7 +751,7 @@ struct CODECIDMAP codecidmap_v[] =
-     },
-     /* DVCPRO HD (decoding only for now) */
-     {
--      .id = CODEC_ID_DVVIDEO,
-+      .id = AV_CODEC_ID_DVVIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -772,7 +772,7 @@ struct CODECIDMAP codecidmap_v[] =
-       // .do_encode = 1
-     },
-     {
--      .id = CODEC_ID_FFVHUFF,
-+      .id = AV_CODEC_ID_FFVHUFF,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -785,7 +785,7 @@ struct CODECIDMAP codecidmap_v[] =
-       .do_encode = 1
-     },
-     {
--      .id = CODEC_ID_FFV1,
-+      .id = AV_CODEC_ID_FFV1,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -801,7 +801,7 @@ struct CODECIDMAP codecidmap_v[] =
-     },
- #if LIBAVCODEC_BUILD >= 3352576
-     {
--      .id = CODEC_ID_DNXHD,
-+      .id = AV_CODEC_ID_DNXHD,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -817,7 +817,7 @@ struct CODECIDMAP codecidmap_v[] =
-     },
- #endif
-     {
--      .id = CODEC_ID_MPEG2VIDEO,
-+      .id = AV_CODEC_ID_MPEG2VIDEO,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -839,7 +839,7 @@ struct CODECIDMAP codecidmap_v[] =
- struct CODECIDMAP codecidmap_a[] =
-   {
-     {
--      .id = CODEC_ID_MP3,
-+      .id = AV_CODEC_ID_MP3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -851,7 +851,7 @@ struct CODECIDMAP codecidmap_a[] =
-       .wav_ids = { 0x50, 0x55, LQT_WAV_ID_NONE },
-     },
-     {
--      .id = CODEC_ID_MP2,
-+      .id = AV_CODEC_ID_MP2,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -866,7 +866,7 @@ struct CODECIDMAP codecidmap_a[] =
-       .compression_id = LQT_COMPRESSION_MP2,
-     },
-     {
--      .id = CODEC_ID_AC3,
-+      .id = AV_CODEC_ID_AC3,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -881,7 +881,7 @@ struct CODECIDMAP codecidmap_a[] =
-       .compression_id = LQT_COMPRESSION_AC3,
-     },
-     {
--      .id = CODEC_ID_QDM2,
-+      .id = AV_CODEC_ID_QDM2,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -896,7 +896,7 @@ struct CODECIDMAP codecidmap_a[] =
- #if 1
-     /* Doesn't work as long as audio chunks are not split into VBR "Samples" */
-     {
--      .id = CODEC_ID_ALAC,
-+      .id = AV_CODEC_ID_ALAC,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -909,7 +909,7 @@ struct CODECIDMAP codecidmap_a[] =
- #if 1
-     /* Sounds ugly */
-     {
--      .id = CODEC_ID_ADPCM_MS,
-+      .id = AV_CODEC_ID_ADPCM_MS,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
-@@ -922,7 +922,7 @@ struct CODECIDMAP codecidmap_a[] =
- #if 1
-     /* Sounds ugly */
-     {
--      .id = CODEC_ID_ADPCM_IMA_WAV,
-+      .id = AV_CODEC_ID_ADPCM_IMA_WAV,
-       .index = -1,
-       .encoder = NULL,
-       .decoder = NULL,
---- plugins/ffmpeg/audio.c.orig
-+++ plugins/ffmpeg/audio.c
-@@ -45,6 +45,12 @@
- #define ENCODE_AUDIO 1
- #endif
- 
-+// Has been deprecated for ages. Now removed. For now do what ffmpeg does
-+// 192000 = 1 second of 48khz 32bit audio
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
-+#endif
-+
- /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */
- 
- /* MPEG Audio header parsing code */
-@@ -626,7 +632,7 @@ static int decode_chunk(quicktime_t * fi
-     {
-     /* If the codec is mp3, make sure to decode the very last frame */
- 
--    if((codec->avctx->codec_id == CODEC_ID_MP3) &&
-+    if((codec->avctx->codec_id == AV_CODEC_ID_MP3) &&
-        (codec->bytes_in_chunk_buffer >= 4))
-       {
-       if(!mpa_decode_header(&mph, codec->chunk_buffer, (const mpa_header*)0))
-@@ -695,7 +701,7 @@ static int decode_chunk(quicktime_t * fi
-     
-     /* Some really broken mp3 files have the header bytes split across 2 chunks */
- 
--    if(codec->avctx->codec_id == CODEC_ID_MP3)
-+    if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
-       {
-       if(codec->bytes_in_chunk_buffer < 4)
-         {
-@@ -806,7 +812,7 @@ static int decode_chunk(quicktime_t * fi
-     
-     if(bytes_decoded < 0)
-       {
--      if(codec->avctx->codec_id == CODEC_ID_MP3)
-+      if(codec->avctx->codec_id == AV_CODEC_ID_MP3)
-         {
-         /* For mp3, bytes_decoded < 0 means, that the frame should be muted */
-         memset(&codec->sample_buffer[track_map->channels * (codec->sample_buffer_end -
-@@ -866,8 +872,8 @@ static void init_compression_info(quickt
-   quicktime_audio_map_t *track_map = &file->atracks[track];
-   quicktime_ffmpeg_audio_codec_t *codec = track_map->codec->priv;
- 
--  if((codec->decoder->id == CODEC_ID_MP2) ||
--     (codec->decoder->id == CODEC_ID_MP3))
-+  if((codec->decoder->id == AV_CODEC_ID_MP2) ||
-+     (codec->decoder->id == AV_CODEC_ID_MP3))
-     {
-     mpa_header h;
-     uint32_t header;
-@@ -909,7 +915,7 @@ static void init_compression_info(quickt
-     else
-       track_map->ci.bitrate = h.bitrate;
-     }
--  else if(codec->decoder->id == CODEC_ID_AC3)
-+  else if(codec->decoder->id == AV_CODEC_ID_AC3)
-     {
*** 636 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303181456.32IEuiMg077077>