summaryrefslogtreecommitdiff
path: root/libavcodec/h264_sei.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-10-22 14:13:29 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-10-30 12:46:56 +0100
commitb4a82e740743744136e07054525560351e4892ae (patch)
treeb0660547fc60b7228579f3a71a7fdd5393347c08 /libavcodec/h264_sei.c
parent8487987b87a252963b27b6adfd82887ea5933918 (diff)
h264: Print the complete user message
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>
Diffstat (limited to 'libavcodec/h264_sei.c')
-rw-r--r--libavcodec/h264_sei.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 2b25840405..1fb1fc5db4 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -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;
}