52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
|
--- src/combined/ffmpeg/ff_audio_decoder.c.orig 2014-06-09 18:08:42.000000000 +0200
|
|||
|
|
+++ src/combined/ffmpeg/ff_audio_decoder.c 2016-02-26 14:31:45.000000000 +0100
|
|||
|
|
@@ -593,7 +593,7 @@
|
|||
|
|
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 @@
|
|||
|
|
/* 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);
|
|||
|
|
@@ -1106,7 +1106,7 @@
|
|||
|
|
|
|||
|
|
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);
|
|||
|
|
--- src/combined/ffmpeg/ff_video_decoder.c.orig 2014-06-24 18:21:06.000000000 +0200
|
|||
|
|
+++ src/combined/ffmpeg/ff_video_decoder.c 2016-02-26 14:31:45.000000000 +0100
|
|||
|
|
@@ -2526,7 +2526,7 @@
|
|||
|
|
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
|
|||
|
|
--- src/dxr3/ffmpeg_encoder.c.orig 2014-03-13 05:06:09.000000000 +0200
|
|||
|
|
+++ src/dxr3/ffmpeg_encoder.c 2016-02-26 14:31:45.000000000 +0100
|
|||
|
|
@@ -164,7 +164,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");
|