mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 15:02:43 +02:00
Fix build errors with FFmpeg5
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:
@@ -2294,11 +2294,13 @@ int32_t container_ffmpeg_update_tracks(Context_t *context, char *filename, int32
|
||||
if (track.avCodecCtx)
|
||||
{
|
||||
ffmpeg_printf(10, " Handle inject_as_pcm = %d\n", track.inject_as_pcm);
|
||||
|
||||
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 0, 100)
|
||||
AVCodec *codec = avcodec_find_decoder(get_codecpar(stream)->codec_id);
|
||||
#else
|
||||
const AVCodec *codec = avcodec_find_decoder(get_codecpar(stream)->codec_id);
|
||||
#endif
|
||||
|
||||
int errorCode = avcodec_open2(track.avCodecCtx, codec, NULL);
|
||||
if (codec != NULL && !errorCode)
|
||||
{
|
||||
|
2
libeplayer3/external/ffmpeg/put_bits.h
vendored
2
libeplayer3/external/ffmpeg/put_bits.h
vendored
@@ -28,9 +28,11 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "libavutil/avassert.h"
|
||||
#include "libavutil/common.h"
|
||||
|
||||
typedef struct PutBitContext
|
||||
{
|
||||
|
1
libeplayer3/external/ffmpeg/src/bitstream.c
vendored
1
libeplayer3/external/ffmpeg/src/bitstream.c
vendored
@@ -30,6 +30,7 @@
|
||||
|
||||
#include <libavutil/avassert.h>
|
||||
#include <ffmpeg/put_bits.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
void avpriv_align_put_bits(PutBitContext *s)
|
||||
|
@@ -9,6 +9,10 @@
|
||||
#include <libavformat/avformat.h>
|
||||
#include <libswresample/swresample.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
|
||||
{
|
||||
|
Reference in New Issue
Block a user