mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 23:12:44 +02:00
fix segfaults on some HEVC/h265 files
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:
@@ -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_XSUB:
|
||||
case AV_CODEC_ID_MOV_TEXT:
|
||||
case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
|
||||
case AV_CODEC_ID_DVB_TELETEXT:
|
||||
// case CODEC_ID_DVB_TELETEXT:
|
||||
// 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:
|
||||
return "S_TEXT/SUBRIP";
|
||||
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:
|
||||
ffmpeg_err("Codec ID %d (%.8x) not found\n", codec_id, codec_id);
|
||||
// Default to injected-pcm for unhandled audio types.
|
||||
|
@@ -1,7 +1,8 @@
|
||||
#ifndef 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_LENGTH 8
|
||||
#define PES_LENGTH_BYTE_0 5
|
||||
|
@@ -86,7 +86,7 @@ static int32_t PreparCodecData(unsigned char *data, unsigned int cd_len, unsigne
|
||||
int32_t ret = -100;
|
||||
if (data)
|
||||
{
|
||||
unsigned char tmp[2048];
|
||||
unsigned char tmp[4096];
|
||||
unsigned int tmp_len = 0;
|
||||
|
||||
h265_printf(10, "H265 have codec data..!");
|
||||
|
Reference in New Issue
Block a user