diff options
Diffstat (limited to 'gnu/packages/patches/stepmania-ffmpeg-compat.patch')
| -rw-r--r-- | gnu/packages/patches/stepmania-ffmpeg-compat.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/gnu/packages/patches/stepmania-ffmpeg-compat.patch b/gnu/packages/patches/stepmania-ffmpeg-compat.patch new file mode 100644 index 0000000000..b5b9bcd8f2 --- /dev/null +++ b/gnu/packages/patches/stepmania-ffmpeg-compat.patch @@ -0,0 +1,49 @@ +See [6] and [7]. +[6] https://github.com/Tatsh/tatsh-overlay/blob/master/games-arcade/stepmania/files/stepmania-ffmpeg-6.patch +[7] https://github.com/Tatsh/tatsh-overlay/blob/master/games-arcade/stepmania/files/stepmania-ffmpeg-7.patch + +diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +index 935ddf324b0..d4eed01d599 100644 +--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp ++++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +@@ -9,6 +9,10 @@ + + #include <cerrno> + ++#if LIBAVCODEC_VERSION_MAJOR > 59 ++#define frame_number frame_num ++#endif ++ + static void FixLilEndian() + { + #if defined(ENDIAN_LITTLE) +@@ -405,7 +405,7 @@ void MovieTexture_FFMpeg::RegisterProtocols() + return; + Done = true; + +-#if !FF_API_NEXT ++#if LIBAVCODEC_VERSION_MAJOR < 58 + avcodec::avcodec_register_all(); + avcodec::av_register_all(); + #endif +@@ -508,7 +508,7 @@ RString MovieDecoder_FFMpeg::OpenCodec() + if( m_pStreamCodec->codec ) + avcodec::avcodec_close( m_pStreamCodec ); + +- avcodec::AVCodec *pCodec = avcodec::avcodec_find_decoder( m_pStreamCodec->codec_id ); ++ const avcodec::AVCodec *pCodec = avcodec::avcodec_find_decoder( m_pStreamCodec->codec_id ); + if( pCodec == nullptr ) + return ssprintf( "Couldn't find decoder %i", m_pStreamCodec->codec_id ); + +diff --git a/src/arch/MovieTexture/MovieTexture_FFMpeg.h b/src/arch/MovieTexture/MovieTexture_FFMpeg.h +index c092b765fc2..99f5ffcb1be 100644 +--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.h ++++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.h +@@ -13,6 +13,7 @@ namespace avcodec + #include <libavformat/avformat.h> + #include <libswscale/swscale.h> + #include <libavutil/pixdesc.h> ++ #include <libavcodec/avcodec.h> + + #if LIBAVCODEC_VERSION_MAJOR >= 58 + #define av_free_packet av_packet_unref
\ No newline at end of file |