summaryrefslogtreecommitdiff
path: root/libavformat/isom.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-20 11:04:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-20 19:05:47 +0100
commit471fe57e1af2bb37055c93688671c9c79ef9b5cd (patch)
tree7f44437fe6bd0654feaba193f323b442e60049f9 /libavformat/isom.h
parenta8858ee11cf4f0ae22e0a9df57bec4ec5dd02f80 (diff)
avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
Diffstat (limited to 'libavformat/isom.h')
-rw-r--r--libavformat/isom.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 2990c9ce82..1df666f1ff 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -88,7 +88,7 @@ typedef struct {
} MOVTrackExt;
typedef struct MOVStreamContext {
- ByteIOContext *pb;
+ AVIOContext *pb;
int ffindex; ///< AVStream index
int next_chunk;
unsigned int chunk_count;
@@ -141,18 +141,18 @@ typedef struct MOVContext {
int chapter_track;
} MOVContext;
-int ff_mp4_read_descr_len(ByteIOContext *pb);
-int ff_mp4_read_descr(AVFormatContext *fc, ByteIOContext *pb, int *tag);
-int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, ByteIOContext *pb);
+int ff_mp4_read_descr_len(AVIOContext *pb);
+int ff_mp4_read_descr(AVFormatContext *fc, AVIOContext *pb, int *tag);
+int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext *pb);
#define MP4IODescrTag 0x02
#define MP4ESDescrTag 0x03
#define MP4DecConfigDescrTag 0x04
#define MP4DecSpecificDescrTag 0x05
-int ff_mov_read_esds(AVFormatContext *fc, ByteIOContext *pb, MOVAtom atom);
+int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb, MOVAtom atom);
enum CodecID ff_mov_get_lpcm_codec_id(int bps, int flags);
-int ff_mov_read_stsd_entries(MOVContext *c, ByteIOContext *pb, int entries);
+int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries);
#endif /* AVFORMAT_ISOM_H */