X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvp3_parser.c;h=ef2c55b8ac53bd46f4252a51c15730c33a1e37e6;hb=3d8c80b611aa1e2f800dd9c8d8f350407f95c042;hp=c22e6dd27761ad6cda430e54e68d1a73eb29e60a;hpb=4231f05b2893b117a4ea86c098612805ed51d295;p=ffmpeg

diff --git a/libavcodec/vp3_parser.c b/libavcodec/vp3_parser.c
index c22e6dd2776..ef2c55b8ac5 100644
--- a/libavcodec/vp3_parser.c
+++ b/libavcodec/vp3_parser.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (C) 2008 Michael Niedermayer
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -25,20 +25,18 @@ static int parse(AVCodecParserContext *s,
                            const uint8_t **poutbuf, int *poutbuf_size,
                            const uint8_t *buf, int buf_size)
 {
-    if(avctx->codec_id == CODEC_ID_THEORA)
-        s->pict_type= (buf[0]&0x40) ? FF_P_TYPE : FF_I_TYPE;
+    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) ? FF_P_TYPE : FF_I_TYPE;
+        s->pict_type= (buf[0]&0x80) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I;
 
     *poutbuf = buf;
     *poutbuf_size = buf_size;
     return buf_size;
 }
 
-AVCodecParser vp3_parser = {
-    { CODEC_ID_THEORA, CODEC_ID_VP3,
-      CODEC_ID_VP6,    CODEC_ID_VP6F, CODEC_ID_VP6A },
-    0,
-    NULL,
-    parse,
+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,
 };