simd add_hfyu_left_prediction

[ffmpeg] / libavcodec / dvdsub_parser.c

diff --git a/libavcodec/dvdsub_parser.c b/libavcodec/dvdsub_parser.c
index a823ab9f3b21fcf361be58e0f2cbc3d1930da1f0..8f1b8d08e3e3f4ef21d5610d865a41736a594f28 100644 (file)
--- a/libavcodec/dvdsub_parser.c
+++ b/libavcodec/dvdsub_parser.c
@@ -1,6 +1,6 @@
 /*
  * DVD subtitle decoding for ffmpeg
- * Copyright (c) 2005 Fabrice Bellard.
+ * Copyright (c) 2005 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -18,6 +18,8 @@
  * License along with FFmpeg; 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,7 +70,7 @@ 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);