diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-20 11:04:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-20 19:05:47 +0100 |
| commit | 471fe57e1af2bb37055c93688671c9c79ef9b5cd (patch) | |
| tree | 7f44437fe6bd0654feaba193f323b442e60049f9 /libavformat/flvdec.c | |
| parent | a8858ee11cf4f0ae22e0a9df57bec4ec5dd02f80 (diff) | |
| download | ffmpeg-471fe57e1af2bb37055c93688671c9c79ef9b5cd.tar.gz | |
avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128)
Diffstat (limited to 'libavformat/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index e6081d9840..ce743b1bcf 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -110,7 +110,7 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co return 0; } -static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) { +static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize) { int length = get_be16(ioc); if(length >= buffsize) { url_fskip(ioc, length); @@ -126,7 +126,7 @@ static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) { static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, int64_t max_pos, int depth) { AVCodecContext *acodec, *vcodec; - ByteIOContext *ioc; + AVIOContext *ioc; AMFDataType amf_type; char str_val[256]; double num_val; @@ -213,7 +213,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { AMFDataType type; AVStream *stream, *astream, *vstream; - ByteIOContext *ioc; + AVIOContext *ioc; int i; char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want. |