mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 15:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix, supplement to fb13b064fb

Browse Source
This commit is contained in:
Jacek Jendrzej
2021-10-27 14:11:08 +02:00
parent 2453d8a030
commit be48a9db33
5 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libgeneric-pc/audio.cpp
View File

@@ -58,6 +58,16 @@ static ao_sample_format sformat;
static AVCodecContext *c = NULL;
static AVCodecParameters *p = NULL;
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(58, 133, 100)
static void get_packet_defaults(AVPacket *pkt)
{
memset(pkt, 0, sizeof(*pkt));
pkt->pts = AV_NOPTS_VALUE;
pkt->dts = AV_NOPTS_VALUE;
pkt->pos = -1;
}
#endif
cAudio::cAudio(void *, void *, void *)
{
@@ -381,6 +391,8 @@ void cAudio::run()
curr_pts = 0;
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 133, 100)
av_init_packet(&avpkt);
#else
get_packet_defaults(&avpkt);
#endif
inp = av_find_input_format("mpegts");
AVIOContext *pIOCtx = avio_alloc_context(inbuf, INBUF_SIZE, // internal Buffer and its size

14
libgeneric-pc/video.cpp
View File

@@ -65,6 +65,16 @@ extern bool HAL_nodec;
static uint8_t *dmxbuf;
static int bufpos;
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(58, 133, 100)
static void get_packet_defaults(AVPacket *pkt)
{
memset(pkt, 0, sizeof(*pkt));
pkt->pts = AV_NOPTS_VALUE;
pkt->dts = AV_NOPTS_VALUE;
pkt->pos = -1;
}
#endif
static const AVRational aspect_ratios[6] =
{
@@ -302,6 +312,8 @@ bool cVideo::ShowPicture(const char *fname)
}
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 133, 100)
av_init_packet(&avpkt);
#else
get_packet_defaults(&avpkt);
#endif
if (av_read_frame(avfc, &avpkt) < 0)
{
@@ -524,6 +536,8 @@ void cVideo::run(void)
dec_r = 0;
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 133, 100)
av_init_packet(&avpkt);
#else
get_packet_defaults(&avpkt);
#endif
inp = av_find_input_format("mpegts");
AVIOContext *pIOCtx = avio_alloc_context(inbuf, INBUF_SIZE, // internal Buffer and its size