Simplify slice type checks.

[ffmpeg] / libavcodec / parser.h

diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 4be12e99137f1128a20cb6270c19c5f6845e7f6e..80ee6894e056225ac8f295401755ae15e52b6425 100644 (file)
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -24,7 +24,6 @@
 #define FFMPEG_PARSER_H
 
 #include "avcodec.h"
-#include "ac3.h"
 
 typedef struct ParseContext{
     uint8_t *buffer;
@@ -42,37 +41,29 @@ 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;
 
 #define END_NOT_FOUND (-100)
 
-int ff_combine_frame(ParseContext *pc, int next, uint8_t **buf, int *buf_size);
+int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size);
 int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf,
                         int buf_size);
 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);
-
 /**
- * Parses AC-3 frame header.
- * Parses the header up to the lfeon element, which is the first 52 or 54 bits
- * depending on the audio coding mode.
- * @param buf[in] Array containing the first 7 bytes of the frame.
- * @param hdr[out] Pointer to struct where header info is written.
- * @return Returns 0 on success, -1 if there is a sync word mismatch,
- * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate)
- * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid.
+ * 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.
  */
-int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
+void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove);
 
-#endif /* !FFMPEG_PARSER_H */
+#endif /* FFMPEG_PARSER_H */