highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h264: Print the complete user message

Browse Source 
Previously the message was cut off at 256th byte.
This will allow dumping the complete x264 encode info when needed.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2015-10-22 14:13:29 +02:00
parent 8487987b87
commit b4a82e7407
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264_sei.c
View File

@ -215,13 +215,17 @@ static int decode_registered_user_data(H264Context *h, int size)
static int decode_unregistered_user_data(H264Context *h, int size)
{
uint8_t user_data[16 + 256];
uint8_t *user_data;
int e, build, i;
if (size < 16)
if (size < 16 || size >= INT_MAX - 16)
return AVERROR_INVALIDDATA;
for (i = 0; i < sizeof(user_data) - 1 && i < size; i++)
user_data = av_malloc(16 + size + 1);
if (!user_data)
return AVERROR(ENOMEM);
for (i = 0; i < size + 16; i++)
user_data[i] = get_bits(&h->gb, 8);
user_data[i] = 0;
@ -232,9 +236,7 @@ static int decode_unregistered_user_data(H264Context *h, int size)
if (strlen(user_data + 16) > 0)
av_log(h->avctx, AV_LOG_DEBUG, "user data:\"%s\"\n", user_data + 16);
for (; i < size; i++)
skip_bits(&h->gb, 8);
av_free(user_data);
return 0;
}