mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 23:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build errors with FFmpeg5

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 7042a6a766
Author: max_10 <max_10@gmx.de>
Date: 2023-01-24 (Tue, 24 Jan 2023)

Origin message was:
------------------
- Fix build errors with FFmpeg5

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2023-01-24 20:57:12 +01:00
committed by vanhofen
parent 6b8b86e750
commit 01dc8379a1
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libeplayer3/container/container_ffmpeg.c
View File

@@ -2294,11 +2294,13 @@ int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32
if (track.avCodecCtx) if (track.avCodecCtx)
{ {
ffmpeg_printf(10, " Handle inject_as_pcm = %d\n", track.inject_as_pcm); ffmpeg_printf(10, " Handle inject_as_pcm = %d\n", track.inject_as_pcm);
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59,0,100)
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 0, 100)
AVCodec *codec = avcodec_find_decoder(get_codecpar(stream)->codec_id); AVCodec *codec = avcodec_find_decoder(get_codecpar(stream)->codec_id);
#else #else
const AVCodec *codec = avcodec_find_decoder(get_codecpar(stream)->codec_id); const AVCodec *codec = avcodec_find_decoder(get_codecpar(stream)->codec_id);
#endif #endif
int errorCode = avcodec_open2(track.avCodecCtx, codec, NULL); int errorCode = avcodec_open2(track.avCodecCtx, codec, NULL);
if (codec != NULL && !errorCode) if (codec != NULL && !errorCode)
{ {

2
libeplayer3/external/ffmpeg/put_bits.h vendored
View File

@@ -28,9 +28,11 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <limits.h>
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/common.h"
typedef struct PutBitContext typedef struct PutBitContext
{ {

1
libeplayer3/external/ffmpeg/src/bitstream.c vendored
View File

@@ -30,6 +30,7 @@
#include <libavutil/avassert.h> #include <libavutil/avassert.h>
#include <ffmpeg/put_bits.h> #include <ffmpeg/put_bits.h>
#include <string.h>
void avpriv_align_put_bits(PutBitContext *s) void avpriv_align_put_bits(PutBitContext *s)

4
libeplayer3/include/manager.h
View File

@@ -9,6 +9,10 @@
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libswresample/swresample.h> #include <libswresample/swresample.h>
#include <libavutil/opt.h> #include <libavutil/opt.h>
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 0, 100)
#include <libavcodec/bsf.h>
#include <libavcodec/avcodec.h>
#endif
typedef enum typedef enum
{ {