Merge decode_cabac_mb_type_b() into calling code.

[ffmpeg] / libavformat / isom.h

diff --git a/libavformat/isom.h b/libavformat/isom.h
index f7831c44057b83d3a8a5d396e349c1efbdf22e07..2661e8d6207ce087e7ab9a6b30b01e6e71d1af81 100644 (file)
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -34,8 +34,8 @@ extern const AVCodecTag codec_movvideo_tags[];
 extern const AVCodecTag codec_movaudio_tags[];
 extern const AVCodecTag ff_codec_movsubtitle_tags[];
 
-int ff_mov_iso639_to_lang(const char *lang, int mp4);
-int ff_mov_lang_to_iso639(unsigned code, char *to);
+int ff_mov_iso639_to_lang(const char lang[4], int mp4);
+int ff_mov_lang_to_iso639(unsigned code, char to[4]);
 
 /* the QuickTime file format is quite convoluted...
  * it has lots of index tables, each indexing something in another one...
@@ -56,11 +56,14 @@ typedef struct {
 typedef struct {
     uint32_t type;
     char *path;
+    char *dir;
+    char volume[28];
+    char filename[64];
+    int16_t nlvl_to, nlvl_from;
 } MOVDref;
 
 typedef struct {
     uint32_t type;
-    int64_t offset;
     int64_t size; /* total size (excluding the size and type fields) */
 } MOVAtom;
 
@@ -106,7 +109,6 @@ typedef struct MOVStreamContext {
     unsigned int keyframe_count;
     int *keyframes;
     int time_scale;
-    int time_rate;
     int time_offset;      ///< time offset of the first edit list entry
     int current_sample;
     unsigned int bytes_per_frame;
@@ -138,4 +140,8 @@ typedef struct MOVContext {
     int itunes_metadata;  ///< metadata are itunes style
 } MOVContext;
 
+int ff_mp4_read_descr_len(ByteIOContext *pb);
+int ff_mov_read_esds(AVFormatContext *fc, ByteIOContext *pb, MOVAtom atom);
+enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags);
+
 #endif /* AVFORMAT_ISOM_H */