diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 01:39:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-30 01:55:31 +0100 |
| commit | ae3313e1548641e3b4a61520e119729a8b61e061 (patch) | |
| tree | c02a97bdede1293f5b180ebfa1ac089cdf8ab8fb /libavcodec/vp8_parser.c | |
| parent | af3b6aed0da5e292897b3be099c3cc7a3a44e2c4 (diff) | |
| parent | 53c20f17c78d1d8a0fc2505868f201e69ff59cc5 (diff) | |
| download | ffmpeg-ae3313e1548641e3b4a61520e119729a8b61e061.tar.gz | |
Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'
* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5':
vp8: K&R formatting cosmetics
Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp8_parser.c')
| -rw-r--r-- | libavcodec/vp8_parser.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/vp8_parser.c b/libavcodec/vp8_parser.c index 096961fec1..afc7f991e6 100644 --- a/libavcodec/vp8_parser.c +++ b/libavcodec/vp8_parser.c @@ -21,18 +21,19 @@ #include "parser.h" static int parse(AVCodecParserContext *s, - AVCodecContext *avctx, - const uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size) + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) { - s->pict_type= (buf[0]&0x01) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; + s->pict_type = (buf[0] & 0x01) ? AV_PICTURE_TYPE_P + : AV_PICTURE_TYPE_I; - *poutbuf = buf; + *poutbuf = buf; *poutbuf_size = buf_size; return buf_size; } AVCodecParser ff_vp8_parser = { - .codec_ids = { AV_CODEC_ID_VP8 }, - .parser_parse = parse, + .codec_ids = { AV_CODEC_ID_VP8 }, + .parser_parse = parse, }; |