# HG changeset patch # User benoit # Date 1276149637 0 # Node ID b39ced9e4fc30056ab20d92c94653ac18ec64c6c # Parent f533ea0b236fe5d4c4b5fe50809581da213600e6 Cosmetics: alignment and long line break. diff -r f533ea0b236f -r b39ced9e4fc3 h264_mp4toannexb_bsf.c --- a/h264_mp4toannexb_bsf.c Thu Jun 10 06:00:06 2010 +0000 +++ b/h264_mp4toannexb_bsf.c Thu Jun 10 06:00:37 2010 +0000 @@ -29,8 +29,8 @@ } H264BSFContext; static int alloc_and_copy(uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *sps_pps, uint32_t sps_pps_size, - const uint8_t *in, uint32_t in_size) { + const uint8_t *sps_pps, uint32_t sps_pps_size, + const uint8_t *in, uint32_t in_size) { uint32_t offset = *poutbuf_size; uint8_t nal_header_size = offset ? 3 : 4; void *tmp; @@ -95,7 +95,8 @@ unit_size = AV_RB16(extradata); total_size += unit_size+4; - if (total_size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE || extradata+2+unit_size > avctx->extradata+avctx->extradata_size) { + if (total_size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE || + extradata+2+unit_size > avctx->extradata+avctx->extradata_size) { av_free(out); return AVERROR(EINVAL); } @@ -143,13 +144,13 @@ /* prepend only to the first type 5 NAL unit of an IDR picture */ if (ctx->first_idr && unit_type == 5) { if (alloc_and_copy(poutbuf, poutbuf_size, - avctx->extradata, avctx->extradata_size, + avctx->extradata, avctx->extradata_size, buf, nal_size) < 0) goto fail; ctx->first_idr = 0; } else { if (alloc_and_copy(poutbuf, poutbuf_size, - NULL, 0, + NULL, 0, buf, nal_size) < 0) goto fail; if (!ctx->first_idr && unit_type == 1)