ARM: ac3: update ff_ac3_extract_exponents_neon per 8b7b2d6

[ffmpeg] / libavcodec / dvdsub_parser.c

diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index a823ab9f3b21fcf361be58e0f2cbc3d1930da1f0..5b07de60df188f21b7780931c9dcdf88c34e86fe 100644 (file)
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -1,23 +1,25 @@
 /*
  * DVD subtitle decoding for ffmpeg
- * Copyright (c) 2005 Fabrice Bellard.
+ * Copyright (c) 2005 Fabrice Bellard
  *
- * 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
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 
 /* parser definition */
@@ -27,14 +29,14 @@ typedef struct DVDSubParseContext {
     int packet_index;
 } DVDSubParseContext;
 
-static int dvdsub_parse_init(AVCodecParserContext *s)
+static av_cold int dvdsub_parse_init(AVCodecParserContext *s)
 {
     return 0;
 }
 
 static int dvdsub_parse(AVCodecParserContext *s,
                         AVCodecContext *avctx,
-                        uint8_t **poutbuf, int *poutbuf_size,
+                        const uint8_t **poutbuf, int *poutbuf_size,
                         const uint8_t *buf, int buf_size)
 {
     DVDSubParseContext *pc = s->priv_data;
@@ -43,6 +45,8 @@ static int dvdsub_parse(AVCodecParserContext *s,
         if (buf_size < 2)
             return 0;
         pc->packet_len = AV_RB16(buf);
+        if (pc->packet_len == 0) /* HD-DVD subpicture packet */
+            pc->packet_len = AV_RB32(buf+2);
         av_freep(&pc->packet);
         pc->packet = av_malloc(pc->packet_len);
     }
@@ -66,13 +70,13 @@ static int dvdsub_parse(AVCodecParserContext *s,
     return buf_size;
 }
 
-static void dvdsub_parse_close(AVCodecParserContext *s)
+static av_cold void dvdsub_parse_close(AVCodecParserContext *s)
 {
     DVDSubParseContext *pc = s->priv_data;
     av_freep(&pc->packet);
 }
 
-AVCodecParser dvdsub_parser = {
+AVCodecParser ff_dvdsub_parser = {
     { CODEC_ID_DVD_SUBTITLE },
     sizeof(DVDSubParseContext),
     dvdsub_parse_init,