Dave Plater
d82fdd94ad
Fix build in 42.2 and other changes OBS-URL: https://build.opensuse.org/request/show/416395 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=90
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
Index: src/combined/ffmpeg/ff_audio_decoder.c
|
|
===================================================================
|
|
--- src/combined/ffmpeg/ff_audio_decoder.c.orig
|
|
+++ 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: src/combined/ffmpeg/ff_video_decoder.c
|
|
===================================================================
|
|
--- src/combined/ffmpeg/ff_video_decoder.c.orig
|
|
+++ 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
|