Move array specifiers outside DECLARE_ALIGNED() invocations

[ffmpeg] / libavcodec / parser.h

diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 5cf1fee28e8ab464885657b5084daf15de6835c6..6274bb2b49609369d08afe27957434e6bfe8bf78 100644 (file)
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -1,7 +1,7 @@
 /*
  * AVCodecParser prototypes and definitions
- * Copyright (c) 2003 Fabrice Bellard.
- * Copyright (c) 2003 Michael Niedermayer.
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2003 Michael Niedermayer
  *
  * This file is part of FFmpeg.
  *
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_PARSER_H
-#define FFMPEG_PARSER_H
+#ifndef AVCODEC_PARSER_H
+#define AVCODEC_PARSER_H
 
 #include "avcodec.h"
 
@@ -34,6 +34,7 @@ typedef struct ParseContext{
     int frame_start_found;
     int overread;               ///< the number of bytes which where irreversibly read from the next frame
     int overread_index;         ///< the index into ParseContext.buffer of the overread bytes
+    uint64_t state64;           ///< contains the last 8 bytes in MSB order
 } ParseContext;
 
 struct MpegEncContext;
@@ -41,12 +42,12 @@ struct MpegEncContext;
 typedef struct ParseContext1{
     ParseContext pc;
 /* XXX/FIXME PC1 vs. PC */
-    /* MPEG2 specific */
+    /* MPEG-2-specific */
     AVRational frame_rate;
     int progressive_sequence;
     int width, height;
 
-    /* XXX: suppress that, needed by MPEG4 */
+    /* XXX: suppress that, needed by MPEG-4 */
     struct MpegEncContext *enc;
     int first_picture;
 } ParseContext1;
@@ -59,7 +60,11 @@ int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf,
 void ff_parse_close(AVCodecParserContext *s);
 void ff_parse1_close(AVCodecParserContext *s);
 
-/* h263dec.c */
-int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
+/**
+ * Fetches timestamps for a specific byte within the current access unit.
+ * @param off byte position within the access unit
+ * @param remove Found timestamps will be removed if set to 1, kept if set to 0.
+ */
+void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove);
 
-#endif /* !FFMPEG_PARSER_H */
+#endif /* AVCODEC_PARSER_H */