1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556 |
- Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
- ===================================================================
- --- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
- +++ xine-lib-1.2.6/src/combined/ffmpeg/ff_audio_decoder.c
- @@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
- int got_frame;
- float gain = this->class->gain;
- if (!this->av_frame)
- - this->av_frame = avcodec_alloc_frame ();
- + this->av_frame = av_frame_alloc ();
-
- consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
- if ((consumed >= 0) && got_frame) {
- @@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
- /* try to reset the wma decoder */
- if( this->decoder_ok ) {
- #if AVAUDIO > 3
- - avcodec_free_frame (&this->av_frame);
- + av_frame_free (&this->av_frame);
- #endif
- pthread_mutex_lock (&ffmpeg_lock);
- avcodec_close (this->context);
- @@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
-
- if( this->context && this->decoder_ok ) {
- #if AVAUDIO > 3
- - avcodec_free_frame (&this->av_frame);
- + av_frame_free (&this->av_frame);
- #endif
- pthread_mutex_lock (&ffmpeg_lock);
- avcodec_close (this->context);
- Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
- ===================================================================
- --- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
- +++ xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
- @@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
- this->stream = stream;
- this->class = (ff_video_class_t *) class_gen;
-
- - this->av_frame = avcodec_alloc_frame();
- + this->av_frame = av_frame_alloc();
- this->context = avcodec_alloc_context();
- this->context->opaque = this;
- #if AVPALETTE == 1
- --- xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000
- +++ xine-lib-1.2.6/src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000
- @@ -161,7 +161,7 @@
- "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
- return 0;
- }
- - this->picture = avcodec_alloc_frame();
- + this->picture = av_frame_alloc();
- if (!this->picture) {
- xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
- "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
|