Support for BMP os2v1.

[ffmpeg] / libavcodec / parser.h

diff --git a/libavcodec/parser.h b/libavcodec/parser.h
index 80a6007e80ffd77dd0b1c6d22b29ff43b7a07051..47eeb4cdeaf9ec120faeb46331c970b8aa8393ad 100644 (file)
--- a/libavcodec/parser.h
+++ b/libavcodec/parser.h
@@ -23,7 +23,7 @@
 #ifndef FFMPEG_PARSER_H
 #define FFMPEG_PARSER_H
 
-#include "ac3.h"
+#include "avcodec.h"
 
 typedef struct ParseContext{
     uint8_t *buffer;
@@ -53,25 +53,10 @@ typedef struct 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.
- */
-int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
-
-#endif /* !FFMPEG_PARSER_H */
+#endif /* FFMPEG_PARSER_H */