FreeBSD Bugzilla – Attachment 170071 Details for
Bug 209348
multimedia/libquicktime: Fix build with ffmpeg 3.0.x
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to fix build of multimedia/libquicktime using ffmpeg 3.0.x
libquicktime.diff (text/plain), 44.96 KB, created by
Ben Woods
on 2016-05-06 23:05:59 UTC
(
hide
)
Description:
Patch to fix build of multimedia/libquicktime using ffmpeg 3.0.x
Filename:
MIME Type:
Creator:
Ben Woods
Created:
2016-05-06 23:05:59 UTC
Size:
44.96 KB
patch
obsolete
>Index: multimedia/libquicktime/files/patch-ffmpeg2 >=================================================================== >--- multimedia/libquicktime/files/patch-ffmpeg2 (revision 414732) >+++ multimedia/libquicktime/files/patch-ffmpeg2 (nonexistent) >@@ -1,96 +0,0 @@ >-Extracted from upstream CVS. >-Index: plugins/ffmpeg/audio.c >-=================================================================== >---- plugins/ffmpeg/audio.c.orig >-+++ plugins/ffmpeg/audio.c >-@@ -45,6 +45,11 @@ >- #define ENCODE_AUDIO 1 >- #endif >- >-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE >-+/* from libavcodec/avcodec.h dated Dec 23 2012 */ >-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio >-+#endif >-+ >- /* The following code was ported from gmerlin_avdecoder (http://gmerlin.sourceforge.net) */ >- >- /* MPEG Audio header parsing code */ >-Index: plugins/ffmpeg/params.c >-=================================================================== >---- plugins/ffmpeg/params.c.orig >-+++ plugins/ffmpeg/params.c >-@@ -101,6 +101,17 @@ typedef struct >- } \ >- } >- >-+#define PARAM_DICT_INT(name, dict_name) \ >-+ { \ >-+ if(!strcasecmp(name, key)) \ >-+ { \ >-+ char buf[128]; \ >-+ snprintf(buf, sizeof(buf), "%d", *(int*)value); \ >-+ av_dict_set(options, dict_name, buf, 0); \ >-+ found = 1; \ >-+ } \ >-+ } >-+ >- #define PARAM_DICT_FLAG(name, dict_name) \ >- { \ >- if(!strcasecmp(name, key)) \ >-@@ -202,8 +213,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >- PARAM_INT("ff_max_b_frames",max_b_frames); >- PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); >- PARAM_INT("ff_b_frame_strategy",b_frame_strategy); >-+ >-+#if LIBAVCODEC_VERSION_MAJOR >= 55 >-+ PARAM_DICT_INT("ff_luma_elim_threshold","luma_elim_threshold"); >-+ PARAM_DICT_INT("ff_chroma_elim_threshold","chroma_elim_threshold"); >-+#else >- PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); >- PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); >-+#endif >-+ >- PARAM_INT("ff_strict_std_compliance",strict_std_compliance); >- PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); >- PARAM_INT("ff_rc_min_rate",rc_min_rate); >-@@ -241,8 +259,15 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >- PARAM_QP2LAMBDA("ff_lmax", lmax); >- PARAM_INT("ff_noise_reduction",noise_reduction); >- PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); >-+ >-+#if LIBAVCODEC_VERSION_MAJOR >= 55 >-+ PARAM_DICT_INT("ff_inter_threshold","inter_threshold"); >-+ PARAM_DICT_INT("ff_quantizer_noise_shaping","quantizer_noise_shaping"); >-+#else >- PARAM_INT("ff_inter_threshold",inter_threshold); >- PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); >-+#endif >-+ >- PARAM_INT("ff_thread_count",thread_count); >- PARAM_INT("ff_me_threshold",me_threshold); >- PARAM_INT("ff_mb_threshold",mb_threshold); >-@@ -272,8 +297,16 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >- PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); >- PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); >- // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused >-+ >-+#if LIBAVCODEC_VERSION_MAJOR >= 55 >-+ PARAM_DICT_FLAG("ff_flag_cbp_rd","cbp_rd"); >-+ PARAM_DICT_FLAG("ff_flag_qp_rd","qp_rd"); >-+ PARAM_DICT_FLAG("ff_flag2_strict_gop","strict_gop"); >-+#else >- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); >- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); >-+ PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); >-+#endif >- >- #if LIBAVCODEC_VERSION_MAJOR >= 54 >- PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); >-@@ -288,7 +321,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >- PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); >- PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); >- PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); >-- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); >- PARAM_ENUM("ff_coder_type",coder_type,coder_type); >- >- } > >Property changes on: multimedia/libquicktime/files/patch-ffmpeg2 >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: multimedia/libquicktime/files/patch-ffmpeg29 >=================================================================== >--- multimedia/libquicktime/files/patch-ffmpeg29 (nonexistent) >+++ multimedia/libquicktime/files/patch-ffmpeg29 (working copy) >@@ -0,0 +1,343 @@ >+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, > >Property changes on: multimedia/libquicktime/files/patch-ffmpeg29 >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: multimedia/libquicktime/files/patch-libav10 >=================================================================== >--- multimedia/libquicktime/files/patch-libav10 (nonexistent) >+++ multimedia/libquicktime/files/patch-libav10 (working copy) >@@ -0,0 +1,711 @@ >+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) >+ { >+ a52_header h; >+ uint8_t * ptr; >+@@ -986,7 +992,7 @@ static int lqt_ffmpeg_decode_audio(quick >+ #endif >+ /* Some codecs need extra stuff */ >+ >+- if(codec->decoder->id == CODEC_ID_ALAC) >++ if(codec->decoder->id == AV_CODEC_ID_ALAC) >+ { >+ header = quicktime_wave_get_user_atom(track_map->track, "alac", &header_len); >+ if(header) >+@@ -995,7 +1001,7 @@ static int lqt_ffmpeg_decode_audio(quick >+ codec->avctx->extradata_size = header_len; >+ } >+ } >+- if(codec->decoder->id == CODEC_ID_QDM2) >++ if(codec->decoder->id == AV_CODEC_ID_QDM2) >+ { >+ header = quicktime_wave_get_user_atom(track_map->track, "QDCA", &header_len); >+ if(header) >+@@ -1495,9 +1501,9 @@ void quicktime_init_audio_codec_ffmpeg(q >+ codec_base->decode_audio = lqt_ffmpeg_decode_audio; >+ codec_base->set_parameter = set_parameter; >+ >+- if((decoder->id == CODEC_ID_MP3) || (decoder->id == CODEC_ID_MP2)) >++ if((decoder->id == AV_CODEC_ID_MP3) || (decoder->id == AV_CODEC_ID_MP2)) >+ codec_base->read_packet = read_packet_mpa; >+- else if(decoder->id == CODEC_ID_AC3) >++ else if(decoder->id == AV_CODEC_ID_AC3) >+ { >+ codec_base->write_packet = write_packet_ac3; >+ codec_base->read_packet = read_packet_ac3; >+--- plugins/ffmpeg/params.c.orig >++++ plugins/ffmpeg/params.c >+@@ -202,8 +202,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >+ PARAM_INT("ff_max_b_frames",max_b_frames); >+ PARAM_FLOAT("ff_b_quant_factor",b_quant_factor); >+ PARAM_INT("ff_b_frame_strategy",b_frame_strategy); >+- PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); >+- PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); >++ /* PARAM_INT("ff_luma_elim_threshold",luma_elim_threshold); */ >++ /* PARAM_INT("ff_chroma_elim_threshold",chroma_elim_threshold); */ >+ PARAM_INT("ff_strict_std_compliance",strict_std_compliance); >+ PARAM_QP2LAMBDA("ff_b_quant_offset",b_quant_offset); >+ PARAM_INT("ff_rc_min_rate",rc_min_rate); >+@@ -241,8 +241,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >+ PARAM_QP2LAMBDA("ff_lmax", lmax); >+ PARAM_INT("ff_noise_reduction",noise_reduction); >+ PARAM_INT_SCALE("ff_rc_initial_buffer_occupancy",rc_initial_buffer_occupancy,1000); >+- PARAM_INT("ff_inter_threshold",inter_threshold); >+- PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); >++ /* PARAM_INT("ff_inter_threshold",inter_threshold); */ >++ /* PARAM_INT("ff_quantizer_noise_shaping",quantizer_noise_shaping); */ >+ PARAM_INT("ff_thread_count",thread_count); >+ PARAM_INT("ff_me_threshold",me_threshold); >+ PARAM_INT("ff_mb_threshold",mb_threshold); >+@@ -272,8 +272,8 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >+ PARAM_FLAG("ff_flag_bitexact",CODEC_FLAG_BITEXACT); >+ PARAM_FLAG("ff_flag_ac_pred",CODEC_FLAG_AC_PRED); >+ // PARAM_FLAG("ff_flag_h263p_umv",CODEC_FLAG_H263P_UMV); // Unused >+- PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); >+- PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); >++ /* PARAM_FLAG("ff_flag_cbp_rd",CODEC_FLAG_CBP_RD); */ >++ /* PARAM_FLAG("ff_flag_qp_rd",CODEC_FLAG_QP_RD); */ >+ >+ #if LIBAVCODEC_VERSION_MAJOR >= 54 >+ PARAM_DICT_FLAG("ff_flag_h263p_aiv", "aiv"); >+@@ -288,7 +288,7 @@ void lqt_ffmpeg_set_parameter(AVCodecCon >+ PARAM_FLAG("ff_flag_loop_filter",CODEC_FLAG_LOOP_FILTER); >+ PARAM_FLAG("ff_flag_closed_gop",CODEC_FLAG_CLOSED_GOP); >+ PARAM_FLAG2("ff_flag2_fast",CODEC_FLAG2_FAST); >+- PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); >++ /* PARAM_FLAG2("ff_flag2_strict_gop",CODEC_FLAG2_STRICT_GOP); */ >+ PARAM_ENUM("ff_coder_type",coder_type,coder_type); >+ >+ } >+--- plugins/ffmpeg/video.c.orig >++++ plugins/ffmpeg/video.c >+@@ -400,7 +400,7 @@ static void lqt_ffmpeg_setup_decoding_co >+ codec->reinterpret_pix_fmt = codec->avctx->pix_fmt; >+ >+ /* First we try codec-specific colormodel matching. */ >+- if(codec->decoder->id == CODEC_ID_DNXHD) >++ 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. */ >+@@ -438,7 +438,7 @@ static void lqt_ffmpeg_setup_encoding_co >+ quicktime_ffmpeg_video_codec_t *codec = vtrack->codec->priv; >+ codec->avctx->pix_fmt = lqt_ffmpeg_get_ffmpeg_colormodel(vtrack->stream_cmodel); >+ >+- if (codec->encoder->id == CODEC_ID_DNXHD) >++ 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 >+@@ -728,13 +728,13 @@ static int lqt_ffmpeg_decode_video(quick >+ >+ /* Set extradata: It's done differently for each codec */ >+ >+- if(codec->decoder->id == CODEC_ID_SVQ3) >++ if(codec->decoder->id == AV_CODEC_ID_SVQ3) >+ { >+ extradata = trak->mdia.minf.stbl.stsd.table[0].table_raw + 4; >+ extradata_size = trak->mdia.minf.stbl.stsd.table[0].table_raw_size - 4; >+ >+ } >+- else if(codec->decoder->id == CODEC_ID_H264) >++ else if(codec->decoder->id == AV_CODEC_ID_H264) >+ { >+ user_atom = quicktime_stsd_get_user_atom(trak, "avcC", &user_atom_len); >+ >+@@ -753,7 +753,7 @@ static int lqt_ffmpeg_decode_video(quick >+ } >+ >+ } >+- else if(codec->decoder->id == CODEC_ID_MPEG4) >++ else if(codec->decoder->id == AV_CODEC_ID_MPEG4) >+ { >+ if(trak->mdia.minf.stbl.stsd.table[0].has_esds) >+ { >+@@ -947,15 +947,15 @@ static int lqt_ffmpeg_decode_video(quick >+ } >+ #endif >+ } >+- if(codec->decoder->id == CODEC_ID_DVVIDEO) >++ if(codec->decoder->id == AV_CODEC_ID_DVVIDEO) >+ { >+ if(vtrack->stream_cmodel == BC_YUV420P) >+ vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; >+ vtrack->interlace_mode = LQT_INTERLACE_BOTTOM_FIRST; >+ vtrack->ci.id = LQT_COMPRESSION_DV; >+ } >+- else if((codec->decoder->id == CODEC_ID_MPEG4) || >+- (codec->decoder->id == CODEC_ID_H264)) >++ else if((codec->decoder->id == AV_CODEC_ID_MPEG4) || >++ (codec->decoder->id == AV_CODEC_ID_H264)) >+ { >+ if(vtrack->stream_cmodel == BC_YUV420P) >+ vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; >+@@ -1299,13 +1299,13 @@ static int lqt_ffmpeg_encode_video(quick >+ { >+ if(vtrack->stream_cmodel == BC_YUV420P) >+ { >+- if(codec->encoder->id == CODEC_ID_MPEG4) >++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) >+ { >+ vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_MPEG2; >+ /* enable interlaced encoding */ >+ vtrack->interlace_mode = LQT_INTERLACE_NONE; >+ } >+- else if(codec->encoder->id == CODEC_ID_DVVIDEO) >++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) >+ { >+ vtrack->chroma_placement = LQT_CHROMA_PLACEMENT_DVPAL; >+ } >+@@ -1340,7 +1340,7 @@ static int lqt_ffmpeg_encode_video(quick >+ codec->avctx->sample_aspect_ratio.num = pixel_width; >+ codec->avctx->sample_aspect_ratio.den = pixel_height; >+ /* Use global headers for mp4v */ >+- if(codec->encoder->id == CODEC_ID_MPEG4) >++ if(codec->encoder->id == AV_CODEC_ID_MPEG4) >+ { >+ if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) >+ { >+@@ -1364,12 +1364,12 @@ static int lqt_ffmpeg_encode_video(quick >+ } >+ #endif >+ } >+- else if((codec->encoder->id == CODEC_ID_MSMPEG4V3) && (trak->strl) && >++ else if((codec->encoder->id == AV_CODEC_ID_MSMPEG4V3) && (trak->strl) && >+ !strncmp(trak->strl->strf.bh.biCompression, "DIV3", 4)) >+ { >+ strncpy(trak->strl->strh.fccHandler, "div3", 4); >+ } >+- else if((codec->encoder->id == CODEC_ID_H263) && >++ else if((codec->encoder->id == AV_CODEC_ID_H263) && >+ (file->file_type & (LQT_FILE_MP4|LQT_FILE_3GP))) >+ { >+ uint8_t d263_data[] = >+@@ -1383,7 +1383,7 @@ static int lqt_ffmpeg_encode_video(quick >+ strncpy(trak->mdia.minf.stbl.stsd.table[0].format, >+ "s263", 4); >+ } >+- else if(codec->encoder->id == CODEC_ID_FFVHUFF) >++ else if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) >+ { >+ if(!(file->file_type & (LQT_FILE_AVI|LQT_FILE_AVI_ODML))) >+ { >+@@ -1391,7 +1391,7 @@ static int lqt_ffmpeg_encode_video(quick >+ codec->write_global_header = 1; >+ } >+ } >+- else if(codec->encoder->id == CODEC_ID_QTRLE) >++ else if(codec->encoder->id == AV_CODEC_ID_QTRLE) >+ { >+ if(vtrack->stream_cmodel == BC_RGBA8888) >+ { >+@@ -1402,11 +1402,11 @@ static int lqt_ffmpeg_encode_video(quick >+ vtrack->track->mdia.minf.stbl.stsd.table[0].depth = 32; >+ } >+ } >+- else if(codec->encoder->id == CODEC_ID_DVVIDEO) >++ else if(codec->encoder->id == AV_CODEC_ID_DVVIDEO) >+ { >+ set_dv_fourcc(width, height, vtrack->stream_cmodel, trak); >+ } >+- else if(codec->encoder->id == CODEC_ID_DNXHD) >++ else if(codec->encoder->id == AV_CODEC_ID_DNXHD) >+ { >+ if(vtrack->interlace_mode != LQT_INTERLACE_NONE) >+ { >+@@ -1558,12 +1558,12 @@ static int lqt_ffmpeg_encode_video(quick >+ >+ #endif >+ >+- if(!was_initialized && codec->encoder->id == CODEC_ID_DNXHD) >++ if(!was_initialized && codec->encoder->id == AV_CODEC_ID_DNXHD) >+ setup_avid_atoms(file, vtrack, codec->buffer, bytes_encoded); >+ >+ if(bytes_encoded) >+ { >+- if (pts == AV_NOPTS_VALUE || (codec->encoder->id == CODEC_ID_DNXHD && pts == 0)) >++ if (pts == AV_NOPTS_VALUE || (codec->encoder->id == AV_CODEC_ID_DNXHD && pts == 0)) >+ { >+ /* Some codecs don't bother generating presentation timestamps. >+ FFMpeg's DNxHD encoder doesn't even bother to set it to AV_NOPTS_VALUE. */ >+@@ -1590,13 +1590,13 @@ static int lqt_ffmpeg_encode_video(quick >+ >+ if(codec->write_global_header && !codec->global_header_written) >+ { >+- if(codec->encoder->id == CODEC_ID_FFVHUFF) >++ if(codec->encoder->id == AV_CODEC_ID_FFVHUFF) >+ { >+ quicktime_user_atoms_add_atom(&trak->mdia.minf.stbl.stsd.table[0].user_atoms, >+ "glbl", >+ codec->avctx->extradata, codec->avctx->extradata_size ); >+ } >+- else if(codec->encoder->id == CODEC_ID_MPEG4) >++ else if(codec->encoder->id == AV_CODEC_ID_MPEG4) >+ { >+ int advanced = 0; >+ if(codec->avctx->max_b_frames || >+@@ -1903,18 +1903,18 @@ void quicktime_init_video_codec_ffmpeg(q >+ codec_base->encode_video = lqt_ffmpeg_encode_video; >+ codec_base->set_pass = set_pass_ffmpeg; >+ >+- if(encoder->id == CODEC_ID_MPEG4) >++ if(encoder->id == AV_CODEC_ID_MPEG4) >+ { >+ codec_base->writes_compressed = writes_compressed_mpeg4; >+ codec_base->init_compressed = init_compressed_mpeg4; >+ codec_base->write_packet = write_packet_mpeg4; >+ } >+- else if(encoder->id == CODEC_ID_MPEG2VIDEO) >++ else if(encoder->id == AV_CODEC_ID_MPEG2VIDEO) >+ { >+ codec_base->writes_compressed = writes_compressed_imx; >+ codec_base->init_compressed = init_compressed_imx; >+ } >+- else if(encoder->id == CODEC_ID_DVVIDEO) >++ else if(encoder->id == AV_CODEC_ID_DVVIDEO) >+ { >+ codec_base->init_compressed = init_compressed_dv; >+ } >+@@ -1922,7 +1922,7 @@ void quicktime_init_video_codec_ffmpeg(q >+ } >+ if(decoder) >+ { >+- if(decoder->id == CODEC_ID_H264) >++ if(decoder->id == AV_CODEC_ID_H264) >+ codec_base->read_packet = read_packet_h264; >+ codec_base->decode_video = lqt_ffmpeg_decode_video; >+ } > >Property changes on: multimedia/libquicktime/files/patch-libav10 >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=170071">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Flags:
woodsb02
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 209348
: 170071 |
170072
|
170073