Attachment #400016 for bug #526434

View | Details | Raw Unified | Return to bug 526434
Collapse All | Expand All




}

cImageInCache::~cImageInCache() {
    #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
    if (FrameBufferYUV->opaque) {
        avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
        FrameBufferYUV->opaque=NULL;
    }
    #else
    if (FiltFrame) {
        av_frame_unref(FiltFrame);
        av_frame_free(&FiltFrame);

                    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

                    if (avcodec_open2(LibavFile->streams[VideoStreamNumber]->codec,Codec,NULL)>=0) {
                        // Get Aspect Ratio

                        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);
                        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)))

                    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

    }

    if (FrameBufferYUV!=NULL) {
        #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
        if (FrameBufferYUV->opaque) {
            avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
            FrameBufferYUV->opaque=NULL;

    if (RSC) {
        #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
            audio_resample_close(RSC);
        #elif defined(LIBAV)
            avresample_close(RSC);
            avresample_free(&RSC);
        #elif defined(FFMPEG)

                1,                                          // linear
                0);                                         // cutoff
            if (!RSC) ToLog(LOGMSG_CRITICAL,QString("CheckResampler: av_audio_resample_init failed"));
        #elif defined(LIBAV)
            this->RSC_InChannelLayout =RSC_InChannelLayout;
            this->RSC_OutChannelLayout=RSC_OutChannelLayout;
            RSC=avresample_alloc_context();

        AVFilterInOut *outputs = (AVFilterInOut *)av_malloc(sizeof(AVFilterInOut));
        AVFilterInOut *inputs  = (AVFilterInOut *)av_malloc(sizeof(AVFilterInOut));

    #elif defined(LIBAV)

        QString args=QString("%1:%2:%3:%4:%5:%6:%7")
            .arg(LibavVideoFile->streams[VideoStreamNumber]->codec->width)

    inputs->pad_idx = 0;
    inputs->next = NULL;

    #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)


//====================================================================================================================

#if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
    int cVideoFile::VideoFilter_Process() {
        #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
            // LIBAV 8

                FrameBufferYUV->opaque=(void *)avfilter_ref_buffer(VideoFilterOut->inputs[0]->cur_buf,AV_PERM_READ);
            }

        #elif defined(LIBAV)
            // LIBAV9
            AVFilterBufferRef *m_pBufferRef=NULL;
            int Ret=av_buffersrc_write_frame(VideoFilterIn,FrameBufferYUV);

    #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)
        u_int8_t *in_data[RESAMPLE_MAX_CHANNELS]={0};
        int     in_linesize=0;
        Data=Frame->data[0];

            } 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,Frame->data,in_linesize,Frame->nb_samples)*DstSampleSize;
            }
        }
    #elif defined(FFMPEG)


    if (!FPSDuration) {
        if (PreviewMode) FPSDuration=double(AV_TIME_BASE)/((cApplicationConfig *)ApplicationConfig)->PreviewFPS;
            else if (VideoStream) FPSDuration=double(VideoStream->avg_frame_rate.den*AV_TIME_BASE)/double(VideoStream->avg_frame_rate.num);
            else FPSDuration=double(AV_TIME_BASE)/double(SoundTrackBloc->SamplingRate);
    }
    // If position >= end of file : disable audio

                                Data=Frame->data[0];
                                #if (defined(LIBAV)&&(LIBAVVERSIONINT<=8))
                                SizeDecoded=Frame->nb_samples*av_get_bytes_per_sample(AudioStream->codec->sample_fmt)*AudioStream->codec->channels;
                                #elif defined(LIBAV)
                                SizeDecoded=av_samples_get_buffer_size(NULL,AudioStream->codec->channels,Frame->nb_samples,AudioStream->codec->sample_fmt,0);
                                #elif defined(FFMPEG)
                                SizeDecoded=Frame->nb_samples*av_get_bytes_per_sample(AudioStream->codec->sample_fmt)*AudioStream->codec->channels;

                            if (FrameBufferYUV==NULL) FrameBufferYUV=ALLOCFRAME();
                            if (FrameBufferYUV) {

                                #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
                                if (FrameBufferYUV->opaque) {
                                    avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
                                    FrameBufferYUV->opaque=NULL;

                                    if ((Deinterlace)&&(!VideoFilterGraph))           VideoFilter_Open();
                                        else if ((!Deinterlace)&&(VideoFilterGraph))  VideoFilter_Close();

                                    #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
                                    if (VideoFilterGraph) VideoFilter_Process();
                                    #elif (defined(LIBAV)&&(LIBAVVERSIONINT>=10) || defined(FFMPEG)&&(FFMPEGVERSIONINT>=201))
                                    AVFrame *FiltFrame=NULL;
                                    if (VideoFilterGraph) {
                                        // FFMPEG 2.0 / LIBAV 10
                                        // push the decoded frame into the filtergraph
                                        if (av_buffersrc_write_frame(VideoFilterIn,FrameBufferYUV)<0) {
                                            ToLog(LOGMSG_INFORMATION,"IN:cVideoFile::ReadFrame : Error while feeding the filtergraph");
                                        } else {
                                            FiltFrame=av_frame_alloc();


                                        // Append this frame
                                        cImageInCache *ObjImage=
                                            #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
                                                new cImageInCache(FrameBufferYUVPosition,NULL,FrameBufferYUV);
                                            #else
                                                new cImageInCache(FrameBufferYUVPosition,FiltFrame,FrameBufferYUV);

                                        IsVideoFind=Nbr>0;
                                    }
                                    if (FreeFrames) {
                                        #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
                                        if (FrameBufferYUV->opaque) {
                                            avfilter_unref_buffer((AVFilterBufferRef *)FrameBufferYUV->opaque);
                                            FrameBufferYUV->opaque=NULL;

                                        FREEFRAME(&FrameBufferYUV);
                                    } else {
                                        FrameBufferYUV=NULL;
                                        #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) || defined(LIBAV)&&(LIBAVVERSIONINT>=10))
                                        FiltFrame     =NULL;
                                        #endif
                                    }


        if (img_convert_ctx!=NULL) {
            int ret;
            #if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) || defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
            if (Frame->opaque) {
                AVFilterBufferRef *Buf=(AVFilterBufferRef *)Frame->opaque;
                ret = sws_scale(

int cVideoFile::getThreadFlags(AVCodecID ID) {
    int Ret=0;
    switch (ID) {
        case AV_CODEC_ID_PRORES:
        case AV_CODEC_ID_MPEG1VIDEO:
        case AV_CODEC_ID_DVVIDEO:
        case AV_CODEC_ID_MPEG2VIDEO:   Ret=FF_THREAD_SLICE;                    break;
        case AV_CODEC_ID_H264 :        Ret=FF_THREAD_FRAME|FF_THREAD_SLICE;    break;
        default:                       Ret=FF_THREAD_FRAME;                    break;
    }
    return Ret;
}

        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

        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

        // 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;
    }

Lines 429-435 Link Here

(-)src/ffDiaporama/engine/cBaseMediaFile.h (-2 / +2 lines)
429		429
430	virtual int VideoFilter_Open();	430	virtual int VideoFilter_Open();
431	virtual void VideoFilter_Close();	431	virtual void VideoFilter_Close();
432	#if defined(LIBAV) \|\| (FFMPEGVERSIONINT<201)	432	#if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) \|\| defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
433	virtual int VideoFilter_Process();	433	virtual int VideoFilter_Process();
434	#endif	434	#endif
435		435
Lines 444-450 Link Here
444	// Audio resampling	444	// Audio resampling
445	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)	445	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)
446	ReSampleContext *RSC;	446	ReSampleContext *RSC;
447	#elif defined(LIBAV) && (LIBAVVERSIONINT<=9)	447	#elif defined(LIBAV)
448	AVAudioResampleContext *RSC;	448	AVAudioResampleContext *RSC;
449	uint64_t RSC_InChannelLayout,RSC_OutChannelLayout;	449	uint64_t RSC_InChannelLayout,RSC_OutChannelLayout;
450	#elif defined(FFMPEG)	450	#elif defined(FFMPEG)

Lines 65-71 Link Here

(-)src/ffDiaporama/engine/cDeviceModelDef.h (-2 / +12 lines)
65		65
66	#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)	66	#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)
67	#define LIBAV	67	#define LIBAV
68	#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)))	68	#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)))
		69	#define LIBAVVERSION "Libav 10 or higher"
		70	#define LIBAVVERSIONINT 10
		71	#include "libavresample/avresample.h"
		72	#define RESAMPLE_MAX_CHANNELS AVRESAMPLE_MAX_CHANNELS
		73	#include "libavfilter/buffersink.h"
		74	#include "libavfilter/buffersrc.h"
		75	#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)))
69	#define LIBAVVERSION "Libav 9.x"	76	#define LIBAVVERSION "Libav 9.x"
70	#define LIBAVVERSIONINT 9	77	#define LIBAVVERSIONINT 9
71	#include "libavresample/avresample.h"	78	#include "libavresample/avresample.h"
Lines 110-116 Link Here
110	#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000	117	#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
111	#endif	118	#endif
112		119
113	#if !defined(FF_API_CODEC_ID)	120	#if (LIBAVCODEC_VERSION_MAJOR < 55)
114	#define AV_CODEC_ID_NONE CODEC_ID_NONE	121	#define AV_CODEC_ID_NONE CODEC_ID_NONE
115	#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG	122	#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
116	#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO	123	#define AV_CODEC_ID_MPEG2VIDEO CODEC_ID_MPEG2VIDEO
Lines 133-138 Link Here
133	#define AV_CODEC_ID_FLAC CODEC_ID_FLAC	140	#define AV_CODEC_ID_FLAC CODEC_ID_FLAC
134	#define AV_CODEC_ID_WMAV1 CODEC_ID_WMAV1	141	#define AV_CODEC_ID_WMAV1 CODEC_ID_WMAV1
135	#define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2	142	#define AV_CODEC_ID_WMAV2 CODEC_ID_WMAV2
		143	#define AV_CODEC_ID_PRORES CODEC_ID_PRORES
		144	#define AV_CODEC_ID_MPEG1VIDEO CODEC_ID_MPEG1VIDEO
		145	#define AV_CODEC_ID_DVVIDEO CODEC_ID_DVVIDEO
136	#endif	146	#endif
137		147
138	#if !defined(avcodec_free_frame)	148	#if !defined(avcodec_free_frame)




            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);
        }
        //=== End of patch
        avformat_free_context(Container);

    if (AudioResampler) {
        #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
            audio_resample_close(AudioResampler);
        #elif defined(LIBAV)
            avresample_close(AudioResampler);
            avresample_free(&AudioResampler);
        #elif defined(FFMPEG)

int cEncodeVideo::getThreadFlags(AVCodecID ID) {
    int Ret=0;
    switch (ID) {
        case AV_CODEC_ID_PRORES:
        case AV_CODEC_ID_MPEG1VIDEO:
        case AV_CODEC_ID_DVVIDEO:
        case AV_CODEC_ID_MPEG2VIDEO:   Ret=FF_THREAD_SLICE;                    break;
        case AV_CODEC_ID_H264 :        Ret=FF_THREAD_FRAME|FF_THREAD_SLICE;    break;
        default:                       Ret=FF_THREAD_FRAME;                    break;
    }
    return Ret;
}

                    Continue=false;
                }
            }
        #elif defined(LIBAV)
            if ((AudioStream->codec->sample_fmt!=ToEncodeMusic.SampleFormat)||(AudioStream->codec->channels!=ToEncodeMusic.Channels)||(AudioSampleRate!=ToEncodeMusic.SamplingRate)) {
                if (!AudioResamplerBuffer) {
                    int out_linesize=0;

    }

    // Define InterleaveFrame to not compute it for each frame
    #if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) || (LIBAVVERSIONINT >=10))
    InterleaveFrame=(strcmp(Container->oformat->name,"avi")!=0);
    #else
    InterleaveFrame=true;

        } else {
            #if defined(LIBAV) && (LIBAVVERSIONINT<=8)
                DestPacket=(u_int8_t *)PacketSound;
            #elif defined(LIBAV)
                // LIBAV 9 => Convert sample format (is needed)
                if ((AudioResampler!=NULL)&&(AudioResamplerBuffer!=NULL)) {
                    DestPacket=AudioResamplerBuffer;

Lines 82-88 Link Here

(-)src/ffDiaporama/engine/_EncodeVideo.h (-1 / +1 lines)
82	int AudioResamplerBufferSize;	82	int AudioResamplerBufferSize;
83	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)	83	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)
84	ReSampleContext *AudioResampler; // Audio resampler	84	ReSampleContext *AudioResampler; // Audio resampler
85	#elif defined(LIBAV) && (LIBAVVERSIONINT<=9)	85	#elif defined(LIBAV)
86	AVAudioResampleContext *AudioResampler;	86	AVAudioResampleContext *AudioResampler;
87	#elif defined(FFMPEG)	87	#elif defined(FFMPEG)
88	SwrContext *AudioResampler;	88	SwrContext *AudioResampler;

Lines 472-478 Link Here

(-)src/ffDiaporama/MainWindow/mainwindow.cpp (-1 / +1 lines)
472	delete ApplicationConfig;	472	delete ApplicationConfig;
473		473
474	// Close some libav additionnals	474	// Close some libav additionnals
475	#if defined(LIBAV) \|\| (defined(FFMPEG)&&(FFMPEGVERSIONINT<201))	475	#if (defined(LIBAV)&&(LIBAVVERSIONINT<=9) \|\| defined(FFMPEG)&&(FFMPEGVERSIONINT<201))
476	avfilter_uninit();	476	avfilter_uninit();
477	#endif	477	#endif
478	avformat_network_deinit();	478	avformat_network_deinit();

Return to bug 526434

Lines 136-142 Link Here

(-)src/ffDiaporama/engine/_EncodeVideo.cpp (-11 / +11 lines)
136	av_freep(&Container->streams[i]->codec->extradata);	136	av_freep(&Container->streams[i]->codec->extradata);
137	av_freep(&Container->streams[i]->codec->subtitle_header);	137	av_freep(&Container->streams[i]->codec->subtitle_header);
138	av_freep(&Container->streams[i]->priv_data);	138	av_freep(&Container->streams[i]->priv_data);
139	if (Container->streams[i]->info) av_freep(&Container->streams[i]->info->duration_error);	139	//if (Container->streams[i]->info) av_freep(&Container->streams[i]->info->duration_error);
140	}	140	}
141	//=== End of patch	141	//=== End of patch
142	avformat_free_context(Container);	142	avformat_free_context(Container);
Lines 151-157 Link Here
151	if (AudioResampler) {	151	if (AudioResampler) {
152	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)	152	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)
153	audio_resample_close(AudioResampler);	153	audio_resample_close(AudioResampler);
154	#elif defined(LIBAV) && (LIBAVVERSIONINT<=9)	154	#elif defined(LIBAV)
155	avresample_close(AudioResampler);	155	avresample_close(AudioResampler);
156	avresample_free(&AudioResampler);	156	avresample_free(&AudioResampler);
157	#elif defined(FFMPEG)	157	#elif defined(FFMPEG)
Lines 185-196 Link Here
185	int cEncodeVideo::getThreadFlags(AVCodecID ID) {	185	int cEncodeVideo::getThreadFlags(AVCodecID ID) {
186	int Ret=0;	186	int Ret=0;
187	switch (ID) {	187	switch (ID) {
188	case CODEC_ID_PRORES:	188	case AV_CODEC_ID_PRORES:
189	case CODEC_ID_MPEG1VIDEO:	189	case AV_CODEC_ID_MPEG1VIDEO:
190	case CODEC_ID_DVVIDEO:	190	case AV_CODEC_ID_DVVIDEO:
191	case CODEC_ID_MPEG2VIDEO: Ret=FF_THREAD_SLICE; break;	191	case AV_CODEC_ID_MPEG2VIDEO: Ret=FF_THREAD_SLICE; break;
192	case CODEC_ID_H264 : Ret=FF_THREAD_FRAME\|FF_THREAD_SLICE; break;	192	case AV_CODEC_ID_H264 : Ret=FF_THREAD_FRAME\|FF_THREAD_SLICE; break;
193	default: Ret=FF_THREAD_FRAME; break;	193	default: Ret=FF_THREAD_FRAME; break;
194	}	194	}
195	return Ret;	195	return Ret;
196	}	196	}
Lines 789-795 Link Here
789	Continue=false;	789	Continue=false;
790	}	790	}
791	}	791	}
792	#elif defined(LIBAV) && (LIBAVVERSIONINT<=9)	792	#elif defined(LIBAV)
793	if ((AudioStream->codec->sample_fmt!=ToEncodeMusic.SampleFormat)\|\|(AudioStream->codec->channels!=ToEncodeMusic.Channels)\|\|(AudioSampleRate!=ToEncodeMusic.SamplingRate)) {	793	if ((AudioStream->codec->sample_fmt!=ToEncodeMusic.SampleFormat)\|\|(AudioStream->codec->channels!=ToEncodeMusic.Channels)\|\|(AudioSampleRate!=ToEncodeMusic.SamplingRate)) {
794	if (!AudioResamplerBuffer) {	794	if (!AudioResamplerBuffer) {
795	int out_linesize=0;	795	int out_linesize=0;
Lines 857-863 Link Here
857	}	857	}
858		858
859	// Define InterleaveFrame to not compute it for each frame	859	// Define InterleaveFrame to not compute it for each frame
860	#if defined(FFMPEG)&&(FFMPEGVERSIONINT>=201)	860	#if (defined(FFMPEG)&&(FFMPEGVERSIONINT>=201) \|\| (LIBAVVERSIONINT >=10))
861	InterleaveFrame=(strcmp(Container->oformat->name,"avi")!=0);	861	InterleaveFrame=(strcmp(Container->oformat->name,"avi")!=0);
862	#else	862	#else
863	InterleaveFrame=true;	863	InterleaveFrame=true;
Lines 1038-1044 Link Here
1038	} else {	1038	} else {
1039	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)	1039	#if defined(LIBAV) && (LIBAVVERSIONINT<=8)
1040	DestPacket=(u_int8_t *)PacketSound;	1040	DestPacket=(u_int8_t *)PacketSound;
1041	#elif defined(LIBAV) && (LIBAVVERSIONINT<=9)	1041	#elif defined(LIBAV)
1042	// LIBAV 9 => Convert sample format (is needed)	1042	// LIBAV 9 => Convert sample format (is needed)
1043	if ((AudioResampler!=NULL)&&(AudioResamplerBuffer!=NULL)) {	1043	if ((AudioResampler!=NULL)&&(AudioResamplerBuffer!=NULL)) {
1044	DestPacket=AudioResamplerBuffer;	1044	DestPacket=AudioResamplerBuffer;