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

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

8
libarmbox/video.cpp
View File

@@ -242,7 +242,11 @@ void write_frame(AVFrame *in_frame, int fd)
return;
static const unsigned char pes_header[] = {0x0, 0x0, 0x1, 0xe0, 0x00, 0x00, 0x80, 0x80, 0x5, 0x21, 0x0, 0x1, 0x0, 0x1};
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59,0,100)
AVCodec *codec = avcodec_find_encoder(AV_CODEC_ID_MPEG2VIDEO);
#else
const AVCodec *codec = avcodec_find_encoder(AV_CODEC_ID_MPEG2VIDEO);
#endif
if (codec)
{
AVCodecContext *codec_context = avcodec_alloc_context3(codec);
@@ -354,7 +358,11 @@ int decode_frame(AVCodecContext *codecContext, AVPacket &packet, int fd)
AVCodecContext *open_codec(AVMediaType mediaType, AVFormatContext *formatContext)
{
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59,0,100)
AVCodec *codec = NULL;
#else
const AVCodec *codec = NULL;
#endif
AVCodecContext *codecContext = NULL;
int stream_index;
#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57,25,101)

2
libeplayer3/container/container_ffmpeg.c
View File

@@ -1829,7 +1829,9 @@ int32_t container_ffmpeg_init_av_context(Context_t *context, char *filename, uin
}
if (avContextTab[AVIdx] != NULL)
{
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59,0,100)
avContextTab[AVIdx]->iformat->flags |= AVFMT_SEEK_TO_PTS;
#endif
avContextTab[AVIdx]->flags = AVFMT_FLAG_GENPTS;
}
printf("minimal Probe: %d\n", context->playback->noprobe);

1
libeplayer3/container/mpeg4p2_ffmpeg.c
View File

@@ -2,6 +2,7 @@
// mpeg4-part2 in mipsel receivers
// http://forums.openpli.org/topic/39326-gstreamer10-and-mpeg4-part2/?hl=%2Bmpeg4+%2Bpart2
//
#include <libavcodec/bsf.h>
// mpeg4_unpack_bframes
typedef struct

2
libeplayer3/container/wrapped_ffmpeg.c
View File

@@ -3,6 +3,8 @@
* allows to compile and use exteplayer3
* with old ffmpeg libs
*/
#include <libavcodec/avcodec.h>
static void wrapped_frame_free(void *param)
{
#if (LIBAVCODEC_VERSION_MAJOR >= 55)

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;