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 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

build with ffmpeg version > 59.0.100

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 6898f3599d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2021-08-29 (Sun, 29 Aug 2021)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2021-08-29 17:10:24 +02:00
committed by vanhofen
parent 51190f575b
commit bfabd54d2b
6 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libgeneric-pc/audio.cpp
View File

@@ -36,6 +36,7 @@ extern "C" {
#include <libavutil/opt.h>
#include <libavutil/samplefmt.h>
#include <libswresample/swresample.h>
#include <libavcodec/avcodec.h>
#include <ao/ao.h>
}
/* ffmpeg buf 2k */
@@ -351,9 +352,14 @@ void cAudio::run()
av_register_all();
#endif
AVCodec *codec;
AVFormatContext *avfc = NULL;
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59,0,100)
AVInputFormat *inp;
AVCodec *codec;
#else
const AVInputFormat *inp;
const AVCodec *codec;
#endif
AVFormatContext *avfc = NULL;
AVFrame *frame;
uint8_t *inbuf = (uint8_t *)av_malloc(INBUF_SIZE);
AVPacket avpkt;

10
libgeneric-pc/video.cpp
View File

@@ -33,6 +33,7 @@ extern "C" {
#include <libavformat/avformat.h>
#include <libavutil/imgutils.h>
#include <libswscale/swscale.h>
#include <libavcodec/avcodec.h>
}
/* ffmpeg buf 32k */
@@ -259,7 +260,7 @@ bool cVideo::ShowPicture(const char *fname)
AVFormatContext *avfc = NULL;
AVCodecContext *c = NULL;
AVCodecParameters *p = NULL;
AVCodec *codec;
const AVCodec *codec;
AVFrame *frame, *rgbframe;
AVPacket avpkt;
@@ -495,11 +496,16 @@ static int my_read(void *, uint8_t *buf, int buf_size)
void cVideo::run(void)
{
hal_info("====================== start decoder thread ================================\n");
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59,0,100)
AVInputFormat *inp;
AVCodec *codec;
#else
const AVInputFormat *inp;
const AVCodec *codec;
#endif
AVCodecParameters *p = NULL;
AVCodecContext *c = NULL;
AVFormatContext *avfc = NULL;
AVInputFormat *inp;
AVFrame *frame, *rgbframe;
uint8_t *inbuf = (uint8_t *)av_malloc(INBUF_SIZE);
AVPacket avpkt;