Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 467576 Details for
Bug 613230
media-video/ffdiaporama-2.2_pre20140701: version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
libav 11 patch for ffdiaporama 2.2
ffdiaporama-2.2_pre-libav11.patch (text/plain), 22.22 KB, created by
laurantino
on 2017-03-19 16:10:14 UTC
(
hide
)
Description:
libav 11 patch for ffdiaporama 2.2
Filename:
MIME Type:
Creator:
laurantino
Created:
2017-03-19 16:10:14 UTC
Size:
22.22 KB
patch
obsolete
>--- ffDiaporama/src/ffDiaporama/MainWindow/mainwindow.cpp 2014-05-04 07:29:11.000000000 +0200 >+++ ffDiaporama/src/ffDiaporama/MainWindow/mainwindow.cpp 2016-12-06 22:34:19.187392586 +0100 >@@ -478,7 +478,7 @@ > delete ApplicationConfig; > > // Close some libav additionnals >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > avfilter_uninit(); > #endif > avformat_network_deinit(); >--- ffDiaporama/src/ffDiaporama/engine/_EncodeVideo.cpp 2016-12-06 22:42:46.384001709 +0100 >+++ ffDiaporama/src/ffDiaporama/engine/_EncodeVideo.cpp 2016-12-06 22:32:29.164006043 +0100 >@@ -136,7 +136,7 @@ > av_freep(&Container->streams[i]->codec->extradata); > av_freep(&Container->streams[i]->codec->subtitle_header); > av_freep(&Container->streams[i]->priv_data); >- if (Container->streams[i]->info) av_freep(&Container->streams[i]->info->duration_error); >+ //if (Container->streams[i]->info) av_freep(&Container->streams[i]->info->duration_error); > } > //=== End of patch > avformat_free_context(Container); >@@ -151,7 +151,7 @@ > if (AudioResampler) { > #if defined(LIBAV) && (LIBAVVERSIONINT<=8) > audio_resample_close(AudioResampler); >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > avresample_close(AudioResampler); > avresample_free(&AudioResampler); > #elif defined(FFMPEG) >@@ -779,7 +779,7 @@ > Continue=false; > } > } >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > if ((AudioStream->codec->sample_fmt!=ToEncodeMusic.SampleFormat)||(AudioStream->codec->channels!=ToEncodeMusic.Channels)||(AudioSampleRate!=ToEncodeMusic.SamplingRate)) { > if (!AudioResamplerBuffer) { > int out_linesize=0; >@@ -847,7 +847,7 @@ > } > > // Define InterleaveFrame to not compute it for each frame >- #if defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) >+ #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) || (LIBAVVERSIONINT >=10)) > InterleaveFrame=(strcmp(Container->oformat->name,"avi")!=0); > #else > InterleaveFrame=true; >@@ -1027,7 +1027,7 @@ > } else { > #if defined(LIBAV) && (LIBAVVERSIONINT<=8) > DestPacket=(u_int8_t *)PacketSound; >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > // LIBAV 9 => Convert sample format (is needed) > if ((AudioResampler!=NULL)&&(AudioResamplerBuffer!=NULL)) { > DestPacket=AudioResamplerBuffer; >--- ffDiaporama/src/ffDiaporama/engine/_EncodeVideo.h 2014-04-12 08:06:15.000000000 +0200 >+++ ffDiaporama/src/ffDiaporama/engine/_EncodeVideo.h 2016-12-06 22:32:59.494939656 +0100 >@@ -82,7 +82,7 @@ > int AudioResamplerBufferSize; > #if defined(LIBAV) && (LIBAVVERSIONINT<=8) > ReSampleContext *AudioResampler; // Audio resampler >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > AVAudioResampleContext *AudioResampler; > #elif defined(FFMPEG) > SwrContext *AudioResampler; >--- ffDiaporama/src/ffDiaporama/engine/cBaseMediaFile.cpp 2016-12-06 22:42:46.383001678 +0100 >+++ ffDiaporama/src/ffDiaporama/engine/cBaseMediaFile.cpp 2016-12-08 20:05:39.662115086 +0100 >@@ -1933,12 +1933,12 @@ > } > > cImageInCache::~cImageInCache() { >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > if (FrameBufferYUV->opaque) { > avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque); > FrameBufferYUV->opaque=NULL; > } >- #elif defined(FFMPEG) && (FFMPEGVERSIONINT>=201) >+ #else > if (FiltFrame) { > av_frame_unref(FiltFrame); > av_frame_free(&FiltFrame); >@@ -2437,7 +2437,6 @@ > LibavFile->streams[VideoStreamNumber]->discard=AVDISCARD_DEFAULT; // Setup STREAM options > > // Setup decoder options >- LibavFile->streams[VideoStreamNumber]->codec->debug_mv =0; // Debug level (0=nothing) > LibavFile->streams[VideoStreamNumber]->codec->debug =0; // Debug level (0=nothing) > LibavFile->streams[VideoStreamNumber]->codec->workaround_bugs =1; // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection > LibavFile->streams[VideoStreamNumber]->codec->idct_algo =FF_IDCT_AUTO; // IDCT algorithm, 0=auto >@@ -2454,12 +2453,12 @@ > if (avcodec_open2(LibavFile->streams[VideoStreamNumber]->codec,Codec,NULL)>=0) { > // Get Aspect Ratio > >- AspectRatio=double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.num)/double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.den); >- >- if (LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.num!=0) >+ if (LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.num!=0) >+ AspectRatio=double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.num)/double(LibavFile->streams[VideoStreamNumber]->codec->sample_aspect_ratio.den); >+ else if (LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.num!=0) > AspectRatio=double(LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.num)/double(LibavFile->streams[VideoStreamNumber]->sample_aspect_ratio.den); >- >- if (AspectRatio==0) AspectRatio=1; >+ else >+ AspectRatio=1; > > // Special case for DVD mode video without PAR > if ((AspectRatio==1)&&(LibavFile->streams[VideoStreamNumber]->codec->coded_width==720)&&((LibavFile->streams[VideoStreamNumber]->codec->coded_height==576)||(LibavFile->streams[VideoStreamNumber]->codec->coded_height==480))) >@@ -2582,7 +2581,6 @@ > AVCodec *ThumbDecoderCodec=avcodec_find_decoder(ThumbStream->codec->codec_id); > > // Setup decoder options >- ThumbStream->codec->debug_mv =0; // Debug level (0=nothing) > ThumbStream->codec->debug =0; // Debug level (0=nothing) > ThumbStream->codec->workaround_bugs =1; // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection > ThumbStream->codec->idct_algo =FF_IDCT_AUTO; // IDCT algorithm, 0=auto >@@ -2751,7 +2749,7 @@ > } > > if (FrameBufferYUV!=NULL) { >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > if (FrameBufferYUV->opaque) { > avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque); > FrameBufferYUV->opaque=NULL; >@@ -2771,7 +2769,7 @@ > if (RSC) { > #if defined(LIBAV) && (LIBAVVERSIONINT<=8) > audio_resample_close(RSC); >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > avresample_close(RSC); > avresample_free(&RSC); > #elif defined(FFMPEG) >@@ -2818,7 +2816,7 @@ > 1, // linear > 0); // cutoff > if (!RSC) ToLog(LOGMSG_CRITICAL,QString("CheckResampler: av_audio_resample_init failed")); >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > this->RSC_InChannelLayout =RSC_InChannelLayout; > this->RSC_OutChannelLayout=RSC_OutChannelLayout; > RSC=avresample_alloc_context(); >@@ -2903,7 +2901,7 @@ > AVFilterInOut *outputs = (AVFilterInOut *)av_malloc(sizeof(AVFilterInOut)); > AVFilterInOut *inputs = (AVFilterInOut *)av_malloc(sizeof(AVFilterInOut)); > >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > > QString args=QString("%1:%2:%3:%4:%5:%6:%7") > .arg(LibavVideoFile->streams[VideoStreamNumber]->codec->width) >@@ -2967,10 +2965,8 @@ > inputs->pad_idx = 0; > inputs->next = NULL; > >- #if defined(LIBAV) && (LIBAVVERSIONINT<=8) >+ #if defined(LIBAV) > if ((result=avfilter_graph_parse(VideoFilterGraph,QString("yadif=1:-1").toLocal8Bit().constData(),inputs,outputs,NULL))<0) { >- #elif (defined(LIBAV) && (LIBAVVERSIONINT<=9)) >- if ((result=avfilter_graph_parse(VideoFilterGraph,QString("yadif=deint=interlaced:mode=send_frame:parity=auto").toLocal8Bit().constData(),inputs,outputs,NULL))<0) { > #elif (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > if ((result=avfilter_graph_parse(VideoFilterGraph,QString("yadif=deint=interlaced:mode=send_frame:parity=auto").toLocal8Bit().constData(),&inputs,&outputs,NULL))<0) { > #elif defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) >@@ -2998,7 +2994,7 @@ > > //==================================================================================================================== > >-#if defined(LIBAV) || (FFMPEGVERSIONINT<201) >+#if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > int cVideoFile::VideoFilter_Process() { > #if defined(LIBAV) && (LIBAVVERSIONINT<=8) > // LIBAV 8 >@@ -3030,7 +3026,7 @@ > FrameBufferYUV->opaque=(void *)avfilter_ref_buffer(VideoFilterOut->inputs[0]->cur_buf,AV_PERM_READ); > } > >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > // LIBAV9 > AVFilterBufferRef *m_pBufferRef=NULL; > int Ret=av_buffersrc_write_frame(VideoFilterIn,FrameBufferYUV); >@@ -3175,7 +3171,7 @@ > #if defined(LIBAV) && (LIBAVVERSIONINT<=8) > Data=(u_int8_t *)av_malloc(MaxAudioLenDecoded); > if (Data) *SizeDecoded=audio_resample(RSC,(short int*)Data,(short int*)Frame->data[0],Frame->nb_samples)*DstSampleSize; >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > u_int8_t *in_data[RESAMPLE_MAX_CHANNELS]={0}; > int in_linesize=0; > Data=Frame->data[0]; >@@ -3190,7 +3186,7 @@ > } else if (av_samples_fill_arrays(out_data,&out_linesize,Data,RSC_OutChannels,out_samples,RSC_OutSampleFmt,1)<0) { > ToLog(LOGMSG_CRITICAL,QString("failed out_data fill arrays")); > } else { >- *SizeDecoded=avresample_convert(RSC,out_data,out_linesize,out_samples,in_data,in_linesize,Frame->nb_samples)*DstSampleSize; >+ *SizeDecoded=avresample_convert(RSC,out_data,out_linesize,out_samples,Frame->data,in_linesize,Frame->nb_samples)*DstSampleSize; > } > } > #elif defined(FFMPEG) >@@ -3208,8 +3204,8 @@ > qreal cVideoFile::GetFPSDuration() { > qreal FPSDuration; > if ((VideoStreamNumber>=0)&&(LibavVideoFile->streams[VideoStreamNumber])) >- FPSDuration=qreal(LibavVideoFile->streams[VideoStreamNumber]->r_frame_rate.den*(AV_TIME_BASE/1000))/qreal(LibavVideoFile->streams[VideoStreamNumber]->r_frame_rate.num); >- else FPSDuration=1; >+ FPSDuration=qreal(LibavVideoFile->streams[VideoStreamNumber]->avg_frame_rate.den*(AV_TIME_BASE/1000))/qreal(LibavVideoFile->streams[VideoStreamNumber]->avg_frame_rate.num); >+ else FPSDuration=1; > return FPSDuration; > } > >@@ -3253,7 +3249,7 @@ > > if (!AudioContext.FPSDuration) { > if (PreviewMode) AudioContext.FPSDuration=double(AV_TIME_BASE)/((cApplicationConfig *)ApplicationConfig)->PreviewFPS; >- else if (VideoStream) AudioContext.FPSDuration=double(VideoStream->r_frame_rate.den*AV_TIME_BASE)/double(VideoStream->r_frame_rate.num); >+ else if (VideoStream) AudioContext.FPSDuration=double(VideoStream->avg_frame_rate.den*AV_TIME_BASE)/double(VideoStream->avg_frame_rate.num); > else AudioContext.FPSDuration=double(AV_TIME_BASE)/double(SoundTrackBloc->SamplingRate); > } > >@@ -3460,7 +3456,7 @@ > if (FrameBufferYUV==NULL) FrameBufferYUV=ALLOCFRAME(); > if (FrameBufferYUV) { > >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > if (FrameBufferYUV->opaque) { > avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque); > FrameBufferYUV->opaque=NULL; >@@ -3499,14 +3495,14 @@ > if ((Deinterlace)&&(!VideoFilterGraph)) VideoFilter_Open(); > else if ((!Deinterlace)&&(VideoFilterGraph)) VideoFilter_Close(); > >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > if (VideoFilterGraph) VideoFilter_Process(); >- #elif defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) >+ #elif (defined(LIBAV)&&(LIBAVVERSIONINT>=10) || defined(FFMPEG)&&(FFMPEGVERSIONINT>=201)) > AVFrame *FiltFrame=NULL; > if (VideoFilterGraph) { >- // FFMPEG 2.0 >+ // FFMPEG 2.0 / LIBAV 10 > // push the decoded frame into the filtergraph >- if (av_buffersrc_add_frame_flags(VideoFilterIn,FrameBufferYUV,AV_BUFFERSRC_FLAG_KEEP_REF)<0) { >+ if (av_buffersrc_write_frame(VideoFilterIn,FrameBufferYUV)<0) { > ToLog(LOGMSG_INFORMATION,"IN:cVideoFile::ReadFrame : Error while feeding the filtergraph"); > } else { > FiltFrame=av_frame_alloc(); >@@ -3539,7 +3535,7 @@ > FrameBufferYUVPosition=int64_t((qreal(pts)*av_q2d(VideoStream->time_base))*AV_TIME_BASE); // Keep actual value for FrameBufferYUV > // Append this frame > cImageInCache *ObjImage= >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > new cImageInCache(FrameBufferYUVPosition,NULL,FrameBufferYUV); > #else > new cImageInCache(FrameBufferYUVPosition,FiltFrame,FrameBufferYUV); >@@ -3561,7 +3557,7 @@ > IsVideoFind=Nbr>0; > } > if (FreeFrames) { >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > if (FrameBufferYUV->opaque) { > avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque); > FrameBufferYUV->opaque=NULL; >@@ -3576,7 +3572,7 @@ > FREEFRAME(&FrameBufferYUV); > } else { > FrameBufferYUV=NULL; >- #if defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) >+ #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) || defined(LIBAV)&&(LIBAVVERSIONINT>=10)) > FiltFrame =NULL; > #endif > } >@@ -3692,7 +3688,7 @@ > Data=Frame->data[0]; > #if (defined(LIBAV)&&(LIBAVVERSIONINT<=8)) > SizeDecoded=Frame->nb_samples*av_get_bytes_per_sample(AudioContext->AudioStream->codec->sample_fmt)*AudioContext->AudioStream->codec->channels; >- #elif (defined(LIBAV)&&(LIBAVVERSIONINT<=9)) >+ #elif defined(LIBAV) > SizeDecoded=av_samples_get_buffer_size(NULL,AudioContext->AudioStream->codec->channels,Frame->nb_samples,AudioContext->AudioStream->codec->sample_fmt,0); > #elif defined(FFMPEG) > SizeDecoded=Frame->nb_samples*av_get_bytes_per_sample(AudioContext->AudioStream->codec->sample_fmt)*AudioContext->AudioStream->codec->channels; >@@ -3764,7 +3760,7 @@ > > if (img_convert_ctx!=NULL) { > int ret; >- #if defined(LIBAV) || (defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > if (Frame->opaque) { > AVFilterBufferRef *Buf=(AVFilterBufferRef *)Frame->opaque; > ret = sws_scale( >@@ -3881,7 +3877,6 @@ > AudioDecoderCodec=avcodec_find_decoder(AudioStream->codec->codec_id); > > // Setup decoder options >- AudioStream->codec->debug_mv =0; // Debug level (0=nothing) > AudioStream->codec->debug =0; // Debug level (0=nothing) > AudioStream->codec->workaround_bugs =1; // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection > AudioStream->codec->idct_algo =FF_IDCT_AUTO; // IDCT algorithm, 0=auto >@@ -3922,7 +3917,6 @@ > VideoDecoderCodec=avcodec_find_decoder(VideoStream->codec->codec_id); > > // Setup decoder options >- VideoStream->codec->debug_mv =0; // Debug level (0=nothing) > VideoStream->codec->debug =0; // Debug level (0=nothing) > VideoStream->codec->workaround_bugs =1; // Work around bugs in encoders which sometimes cannot be detected automatically : 1=autodetection > VideoStream->codec->idct_algo =FF_IDCT_AUTO; // IDCT algorithm, 0=auto >@@ -3936,6 +3930,18 @@ > // Hack to correct wrong frame rates that seem to be generated by some codecs > if (VideoStream->codec->time_base.num>1000 && VideoStream->codec->time_base.den==1) > VideoStream->codec->time_base.den=1000; >+ >+ if (VideoStream->codec->time_base.num == 0) { >+ VideoStream->codec->time_base.num = VideoStream->avg_frame_rate.den; >+ VideoStream->codec->time_base.den = VideoStream->avg_frame_rate.num; >+ } >+ >+ if (VideoStream->codec->sample_aspect_ratio.num == 0) { >+ if (VideoStream->sample_aspect_ratio.num == 0) >+ VideoStream->codec->sample_aspect_ratio.num = VideoStream->codec->sample_aspect_ratio.den = 1; >+ else >+ VideoStream->codec->sample_aspect_ratio = VideoStream->sample_aspect_ratio; >+ } > > if ((VideoDecoderCodec==NULL)||(avcodec_open2(VideoStream->codec,VideoDecoderCodec,NULL)<0)) return false; > LibavStartTime=LibavVideoFile->start_time; >--- ffDiaporama/src/ffDiaporama/engine/cBaseMediaFile.h 2014-04-20 09:49:29.000000000 +0200 >+++ ffDiaporama/src/ffDiaporama/engine/cBaseMediaFile.h 2016-12-06 22:21:11.555144372 +0100 >@@ -456,7 +456,7 @@ > > virtual int VideoFilter_Open(); > virtual void VideoFilter_Close(); >- #if defined(LIBAV) || (FFMPEGVERSIONINT<201) >+ #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201)) > virtual int VideoFilter_Process(); > #endif > >@@ -471,7 +471,7 @@ > // Audio resampling > #if defined(LIBAV) && (LIBAVVERSIONINT<=8) > ReSampleContext *RSC; >- #elif defined(LIBAV) && (LIBAVVERSIONINT<=9) >+ #elif defined(LIBAV) > AVAudioResampleContext *RSC; > uint64_t RSC_InChannelLayout,RSC_OutChannelLayout; > #elif defined(FFMPEG) >--- ffDiaporama/src/ffDiaporama/engine/cDeviceModelDef.h 2016-12-06 22:42:46.383001678 +0100 >+++ ffDiaporama/src/ffDiaporama/engine/cDeviceModelDef.h 2016-12-06 22:22:45.307031242 +0100 >@@ -64,7 +64,14 @@ > > #if (LIBAVUTIL_VERSION_MICRO<100)&&(LIBAVCODEC_VERSION_MICRO<100)&&(LIBAVFORMAT_VERSION_MICRO<100)&&(LIBAVDEVICE_VERSION_MICRO<100)&&(LIBAVFILTER_VERSION_MICRO<100)&&(LIBSWSCALE_VERSION_MICRO<100) > #define LIBAV >- #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,3,0))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(54,35,0))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(54,20,0))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(53,2,0))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,3,0))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,1,1))) >+ #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(53,3,0))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,34,1))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,0))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(54,0,0))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(4,2,0))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,1,2))) >+ #define LIBAVVERSION "Libav 10 or higher" >+ #define LIBAVVERSIONINT 10 >+ #include "libavresample/avresample.h" >+ #define RESAMPLE_MAX_CHANNELS AVRESAMPLE_MAX_CHANNELS >+ #include "libavfilter/buffersink.h" >+ #include "libavfilter/buffersrc.h" >+ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,3,0))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(54,35,0))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(54,20,0))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(53,2,0))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,3,0))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,1,1))) > #define LIBAVVERSION "Libav 9.x" > #define LIBAVVERSIONINT 9 > #include "libavresample/avresample.h"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 613230
:
467572
|
467574
|
467576
|
467578
|
467610
|
467612
|
475160
|
475162
|
509106
|
509108