diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-24 19:45:54 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-30 00:17:41 -0300 |
| commit | 9cd361c5c1f3550df9b2d4bd13b02ea592727f7c (patch) | |
| tree | 4a7e268f5f876ce7891a665e1b4278a598d0e8cc | |
| parent | ae7df68edd79bce5c318810c6b307ee4e81cd2a6 (diff) | |
| download | ffmpeg-9cd361c5c1f3550df9b2d4bd13b02ea592727f7c.tar.gz | |
avformat/avc: refactor ff_isom_write_avcc
This lets us remove one indentation level.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/avc.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavformat/avc.c b/libavformat/avc.c index 5232ed55f8..a764ec0422 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -105,17 +105,22 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { + uint8_t *buf = NULL, *end, *start = NULL; + uint8_t *sps = NULL, *pps = NULL; + uint32_t sps_size = 0, pps_size = 0; + int ret; + if (len <= 6) return AVERROR_INVALIDDATA; /* check for H.264 start code */ - if (AV_RB32(data) == 0x00000001 || - AV_RB24(data) == 0x000001) { - uint8_t *buf=NULL, *end, *start; - uint32_t sps_size=0, pps_size=0; - uint8_t *sps=0, *pps=0; + if (AV_RB32(data) != 0x00000001 && + AV_RB24(data) != 0x000001) { + avio_write(pb, data, len); + return 0; + } - int ret = ff_avc_parse_nal_units_buf(data, &buf, &len); + ret = ff_avc_parse_nal_units_buf(data, &buf, &len); if (ret < 0) return ret; start = buf; @@ -156,9 +161,6 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) avio_wb16(pb, pps_size); avio_write(pb, pps, pps_size); av_free(start); - } else { - avio_write(pb, data, len); - } return 0; } |