patch for sh4 and actual ffmpeg versions (thx DBoxOldie)

Origin commit data
------------------
Branch: master
Commit: e8f7fd7a59
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-02-04 (Tue, 04 Feb 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2020-02-04 22:20:44 +01:00
committed by vanhofen
parent e4d582ad97
commit 7d62ce97a9
10 changed files with 281 additions and 100 deletions

View File

@@ -38,6 +38,14 @@ extern "C" {
#include <libavutil/opt.h>
}
#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT( 57,25,100 ))
#define EPLAYER_MAX_CODECS 16
struct CodecList
{
AVCodecContext *codec;
};
#endif
class Player;
class Track;
@@ -63,6 +71,9 @@ class Input
Player *player;
AVFormatContext *avfc;
#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT( 57,25,100 ))
CodecList codecs[EPLAYER_MAX_CODECS];
#endif
uint64_t readCount;
int64_t calcPts(AVStream * stream, int64_t pts);
@@ -85,6 +96,7 @@ class Input
bool GetMetadata(std::vector<std::string> &keys, std::vector<std::string> &values);
bool GetReadCount(uint64_t &readcount);
AVFormatContext *GetAVFormatContext();
AVCodecContext *GetCodecContext(unsigned int index);
void ReleaseAVFormatContext();
};

View File

@@ -37,6 +37,26 @@ extern "C" {
#define AV_CODEC_ID_INJECTPCM AV_CODEC_ID_PCM_S16LE
/* wrapper */
#if (LIBAVFORMAT_VERSION_INT > AV_VERSION_INT( 57,25,100 ))
static AVCodecParameters __attribute__ ((unused)) *get_codecpar(AVStream *stream)
{
return stream->codecpar;
}
#else
static AVCodecContext __attribute__ ((unused)) *get_codecpar(AVStream *stream)
{
return stream->codec;
}
#endif
#if (LIBAVCODEC_VERSION_MAJOR > 55)
#define av_free_packet av_packet_unref
#else
#define av_packet_unref av_free_packet
#endif
/* end wrapper */
class Player;
class Writer