cinelerra-ffmpeg.patch

   1 --- cinelerra-4/quicktime/mpeg4.c~      2008-09-02 14:38:12.000000000 +0300
   2 +++ cinelerra-4/quicktime/mpeg4.c       2009-07-07 11:53:27.567616978 +0300
   3 @@ -680,7 +680,11 @@
   4
   5  //             context->b_quant_factor = 1.25;
   6  //             context->b_quant_offset = 1.25;
   7 +//               #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
   8  //                     context->error_resilience = FF_ER_CAREFUL;
   9 +//               #else
  10 +//                     context->error_recognition = FF_ER_CAREFUL;
  11 +//               #endif
  12  //                     context->error_concealment = 3;
  13  //                     context->frame_skip_cmp = FF_CMP_DCTMAX;
  14  //                     context->ildct_cmp = FF_CMP_VSAD;
  15 --- cinelerra-4/quicktime/wma.c 2007-01-09 08:09:49.000000000 +0100
  16 +++ cinelerra-4-new/quicktime/wma.c     2008-10-11 18:57:13.831898263 +0200
  17 @@ -187,11 +187,20 @@ printf("decode 2 %x %llx %llx\n", chunk_
  18
  19  // Decode chunk into work buffer.
  20                 pthread_mutex_lock(&ffmpeg_lock);
  21 +        #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
  22                 result = avcodec_decode_audio(codec->decoder_context,
  23                         (int16_t*)(codec->work_buffer + codec->output_size * sample_size),
  24              &bytes_decoded,
  25              codec->packet_buffer,
  26                         chunk_size);
  27 +        #else
  28 +               bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
  29 +               result = avcodec_decode_audio2(codec->decoder_context,
  30 +                       (int16_t*)(codec->work_buffer + codec->output_size * sample_size),
  31 +                       &bytes_decoded,
  32 +                       codec->packet_buffer,
  33 +                       chunk_size);
  34 +        #endif
  35                 pthread_mutex_unlock(&ffmpeg_lock);
  36                 if(bytes_decoded <= 0)
  37                 {
  38 --- cinelerra-4/cinelerra/fileffmpeg.C  2008-08-06 10:58:43.000000000 +0200
  39 +++ cinelerra-4-new/cinelerra/fileffmpeg.C      2008-10-11 19:10:39.978678517 +0200
  40 @@ -384,7 +384,7 @@ void FileFFMPEG::dump_context(void *ptr)
  41         printf("    codec_id=%d\n", context->codec_id);
  42         printf("    codec_tag=%d\n", context->codec_tag);
  43         printf("    workaround_bugs=%d\n", context->workaround_bugs);
  44 -       printf("    error_resilience=%d\n", context->error_resilience);
  45 +       printf("    error_recognition=%d\n", context->error_recognition);
  46         printf("    has_b_frames=%d\n", context->has_b_frames);
  47         printf("    block_align=%d\n", context->block_align);
  48         printf("    parse_only=%d\n", context->parse_only);
  49 @@ -393,7 +393,7 @@ void FileFFMPEG::dump_context(void *ptr)
  50         printf("    slice_offset=%p\n", context->slice_offset);
  51         printf("    error_concealment=%d\n", context->error_concealment);
  52         printf("    dsp_mask=%p\n", context->dsp_mask);
  53 -       printf("    bits_per_sample=%d\n", context->bits_per_sample);
  54 +       printf("    bits_per_coded_sample=%d\n", context->bits_per_coded_sample);
  55         printf("    slice_flags=%d\n", context->slice_flags);
  56         printf("    xvmc_acceleration=%d\n", context->xvmc_acceleration);
  57         printf("    antialias_algo=%d\n", context->antialias_algo);