diff options
| author | Martin Storsjö <martin@martin.st> | 2012-05-05 00:38:05 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-05-05 20:41:37 +0300 |
| commit | 3c148703f61d8862eb623484da1c679d55860148 (patch) | |
| tree | e965c284c4cbac101eb4d4078ec0de6d3c4fbb69 | |
| parent | b36886174795fb88ddcab22d738cc5b6de2fd5fc (diff) | |
| download | ffmpeg-3c148703f61d8862eb623484da1c679d55860148.tar.gz | |
rtpdec_h264: Reorder code blocks
This removes one level of indentation.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtpdec_h264.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index d9b2700afd..784c5ec1c4 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -137,26 +137,25 @@ static int sdp_parse_fmtp_config_h264(AVStream *stream, uint8_t *dest = av_malloc(packet_size + sizeof(start_sequence) + codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); - if (dest) { - if (codec->extradata_size) { - memcpy(dest, codec->extradata, codec->extradata_size); - av_free(codec->extradata); - } - - memcpy(dest + codec->extradata_size, start_sequence, - sizeof(start_sequence)); - memcpy(dest + codec->extradata_size + sizeof(start_sequence), - decoded_packet, packet_size); - memset(dest + codec->extradata_size + sizeof(start_sequence) + - packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); - - codec->extradata = dest; - codec->extradata_size += sizeof(start_sequence) + packet_size; - } else { + if (!dest) { av_log(codec, AV_LOG_ERROR, "Unable to allocate memory for extradata!"); return AVERROR(ENOMEM); } + if (codec->extradata_size) { + memcpy(dest, codec->extradata, codec->extradata_size); + av_free(codec->extradata); + } + + memcpy(dest + codec->extradata_size, start_sequence, + sizeof(start_sequence)); + memcpy(dest + codec->extradata_size + sizeof(start_sequence), + decoded_packet, packet_size); + memset(dest + codec->extradata_size + sizeof(start_sequence) + + packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); + + codec->extradata = dest; + codec->extradata_size += sizeof(start_sequence) + packet_size; } } av_log(codec, AV_LOG_DEBUG, "Extradata set to %p (size: %d)!", |