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

fix segfaults on some HEVC/h265 files

Browse Source 
Origin commit data
------------------
Branch: master
Commit: b6260c143e
Author: TangoCash <eric@loxat.de>
Date: 2019-08-25 (Sun, 25 Aug 2019)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2019-08-25 22:17:54 +02:00
committed by vanhofen
parent ccadb3181f
commit 0ecc2fbd57
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libeplayer3/container/container_ffmpeg.c
View File

@@ -434,7 +434,6 @@ static char *Codec2Encoding(int32_t codec_id, int32_t media_type, uint8_t *extra
case AV_CODEC_ID_DVB_SUBTITLE: case AV_CODEC_ID_DVB_SUBTITLE:
case AV_CODEC_ID_XSUB: case AV_CODEC_ID_XSUB:
case AV_CODEC_ID_MOV_TEXT: case AV_CODEC_ID_MOV_TEXT:
case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
case AV_CODEC_ID_DVB_TELETEXT: case AV_CODEC_ID_DVB_TELETEXT:
// case CODEC_ID_DVB_TELETEXT: // case CODEC_ID_DVB_TELETEXT:
// return "S_TEXT/SRT"; /* fixme */ // return "S_TEXT/SRT"; /* fixme */
@@ -445,7 +444,9 @@ static char *Codec2Encoding(int32_t codec_id, int32_t media_type, uint8_t *extra
case AV_CODEC_ID_SUBRIP: case AV_CODEC_ID_SUBRIP:
return "S_TEXT/SUBRIP"; return "S_TEXT/SUBRIP";
case AV_CODEC_ID_WEBVTT: case AV_CODEC_ID_WEBVTT:
return "D_WEBVTT/SUBTITLES"; return "S_TEXT/WEBVTT";
case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
return "S_GRAPHIC/PGS";
default: default:
ffmpeg_err("Codec ID %d (%.8x) not found\n", codec_id, codec_id); ffmpeg_err("Codec ID %d (%.8x) not found\n", codec_id, codec_id);
// Default to injected-pcm for unhandled audio types. // Default to injected-pcm for unhandled audio types.

3
libeplayer3/include/pes.h
View File

@@ -1,7 +1,8 @@
#ifndef pes_123 #ifndef pes_123
#define pes_123 #define pes_123
#define PES_MAX_HEADER_SIZE 64 #define PES_HEADER_SIZE 9 ///< size of pes header
#define PES_MAX_HEADER_SIZE (PES_HEADER_SIZE + 256) ///< maximal header size
#define PES_PRIVATE_DATA_FLAG 0x80 #define PES_PRIVATE_DATA_FLAG 0x80
#define PES_PRIVATE_DATA_LENGTH 8 #define PES_PRIVATE_DATA_LENGTH 8
#define PES_LENGTH_BYTE_0 5 #define PES_LENGTH_BYTE_0 5

2
libeplayer3/output/writer/mipsel/h265.c
View File

@@ -86,7 +86,7 @@ static int32_t PreparCodecData(unsigned char *data, unsigned int cd_len, unsigne
int32_t ret = -100; int32_t ret = -100;
if (data) if (data)
{ {
unsigned char tmp[2048]; unsigned char tmp[4096];
unsigned int tmp_len = 0; unsigned int tmp_len = 0;
h265_printf(10, "H265 have codec data..!"); h265_printf(10, "H265 have codec data..!");