diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 00:25:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 00:25:21 +0200 |
| commit | d063bb63cb389648d149bd1d9a886e12ed2e4d47 (patch) | |
| tree | 3e656fce9989c617a2337eb55c040337045b28a8 /libavcodec/vp3_parser.c | |
| parent | 909757fabdf8d7f9360a06a81625a58a5ec3e05c (diff) | |
| parent | d2264740e6345a4bcfaeac529a66715bdd5f8fbe (diff) | |
| download | ffmpeg-d063bb63cb389648d149bd1d9a886e12ed2e4d47.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
VP3: K&R formatting cosmetics
Conflicts:
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp3_parser.c')
| -rw-r--r-- | libavcodec/vp3_parser.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libavcodec/vp3_parser.c b/libavcodec/vp3_parser.c index ce15309356..7ee046c543 100644 --- a/libavcodec/vp3_parser.c +++ b/libavcodec/vp3_parser.c @@ -21,22 +21,24 @@ #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) { - if(avctx->codec_id == AV_CODEC_ID_THEORA) - s->pict_type= (buf[0]&0x40) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; + if (avctx->codec_id == AV_CODEC_ID_THEORA) + s->pict_type = (buf[0] & 0x40) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; else - s->pict_type= (buf[0]&0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; + s->pict_type = (buf[0] & 0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; - *poutbuf = buf; + *poutbuf = buf; *poutbuf_size = buf_size; return buf_size; } AVCodecParser ff_vp3_parser = { - .codec_ids = { AV_CODEC_ID_THEORA, AV_CODEC_ID_VP3, AV_CODEC_ID_VP6, - AV_CODEC_ID_VP6F, AV_CODEC_ID_VP6A }, - .parser_parse = parse, + .codec_ids = { + AV_CODEC_ID_THEORA, AV_CODEC_ID_VP3, + AV_CODEC_ID_VP6, AV_CODEC_ID_VP6F, AV_CODEC_ID_VP6A + }, + .parser_parse = parse, }; |