diff options
| author | Benoit Fouet <benoit.fouet@free.fr> | 2010-06-10 06:00:37 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2010-06-10 06:00:37 +0000 |
| commit | bb5cfc48f1f95eacd093b447cca4a451c396905b (patch) | |
| tree | d6816d764775d11f5fc097489cc2575a8e77d227 /libavcodec/h264_mp4toannexb_bsf.c | |
| parent | 1f7d2f54c5ee6637998f11dbf44a99e956afb291 (diff) | |
| download | ffmpeg-streaming-bb5cfc48f1f95eacd093b447cca4a451c396905b.zip ffmpeg-streaming-bb5cfc48f1f95eacd093b447cca4a451c396905b.tar.gz | |
Cosmetics: alignment and long line break.
Originally committed as revision 23559 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_mp4toannexb_bsf.c')
| -rw-r--r-- | libavcodec/h264_mp4toannexb_bsf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index e1d49c1..e2ee10a 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -29,8 +29,8 @@ typedef struct H264BSFContext { } 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 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc, 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 @@ static int h264_mp4toannexb_filter(AVBitStreamFilterContext *bsfc, /* 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) |
