diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 22:03:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 22:03:11 +0200 |
| commit | 60a876fe7b50935749200ae7f387e7f251b1a856 (patch) | |
| tree | ef52b72805b02462b6c828543dae1d5377add80f | |
| parent | 16f9f7b881d2025e47c73fc30dbe5cc47109a711 (diff) | |
| parent | 752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8 (diff) | |
| download | ffmpeg-60a876fe7b50935749200ae7f387e7f251b1a856.tar.gz | |
Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'
* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
rtpdec_hevc: Rename a variable for clarity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 16a4d0a312..2ee233ddfb 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -109,7 +109,7 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s, while (*value) { char base64packet[1024]; uint8_t decoded_packet[1024]; - int packet_size; + int decoded_packet_size; char *dst = base64packet; while (*value && *value != ',' && @@ -121,11 +121,11 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s, if (*value == ',') value++; - packet_size = av_base64_decode(decoded_packet, base64packet, - sizeof(decoded_packet)); - if (packet_size > 0) { - uint8_t *dest = av_malloc(packet_size + sizeof(start_sequence) + - *size_ptr); + decoded_packet_size = av_base64_decode(decoded_packet, base64packet, + sizeof(decoded_packet)); + if (decoded_packet_size > 0) { + uint8_t *dest = av_malloc(decoded_packet_size + + sizeof(start_sequence) + *size_ptr); if (!dest) { av_log(s, AV_LOG_ERROR, "Unable to allocate memory for extradata!\n"); @@ -139,10 +139,10 @@ static av_cold int hevc_sdp_parse_fmtp_config(AVFormatContext *s, memcpy(dest + *size_ptr, start_sequence, sizeof(start_sequence)); memcpy(dest + *size_ptr + sizeof(start_sequence), - decoded_packet, packet_size); + decoded_packet, decoded_packet_size); *data_ptr = dest; - *size_ptr += sizeof(start_sequence) + packet_size; + *size_ptr += sizeof(start_sequence) + decoded_packet_size; } } } |