cap_ffmpeg_impl.patch

Delia Passalacqua, 2011-10-18 05:54 pm

Download (1.5 kB)

 
cap_ffmpeg_impl.hpp (copia locale)
540 540

  
541 541
        avcodec_thread_init(enc, get_number_of_cpus());
542 542

  
543
        #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 4, 0)
543
        #if LIBAVFORMAT_BUILD < CALC_FFMPEG_VERSION(53, 2, 0)
544 544
            #define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
545 545
        #endif
546 546
        
......
631 631
		        continue;
632 632
    		}
633 633

  
634
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
634
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
635 635
			avcodec_decode_video2(video_st->codec, picture, &got_picture, &packet); 
636 636
#else
637 637
	#if LIBAVFORMAT_BUILD > 4628
......
881 881

  
882 882
static const char * icvFFMPEGErrStr(int err)
883 883
{
884
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
884
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
885 885
    switch(err) {
886 886
 		case AVERROR_BSF_NOT_FOUND:
887 887
 			return "Bitstream filter not found";
......
1333 1333

  
1334 1334
	/* auto detect the output format from the name and fourcc code. */
1335 1335

  
1336
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
1336
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
1337 1337
	fmt = av_guess_format(NULL, filename, NULL);
1338 1338
#else
1339 1339
	fmt = guess_format(NULL, filename, NULL);
......
1361 1361
#endif
1362 1362

  
1363 1363
    // alloc memory for context
1364
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 4, 0)
1364
#if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(53, 2, 0)
1365 1365
	oc = avformat_alloc_context();
1366 1366
#else
1367 1367
	oc = av_alloc_format_context();