diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-28 14:57:55 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-01 12:22:16 -0500 |
| commit | e356fc57a2e9887370caec58d8aafeafd1f336dc (patch) | |
| tree | f500dfcba3ee9a3b24462d3fa33df8e654695814 /libavformat/nuv.c | |
| parent | 6b4aa5dac8f41aa452d0ce9a1bede9e59a303060 (diff) | |
lavf: replace all uses of url_fskip with avio_seek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/nuv.c')
| -rw-r--r-- | libavformat/nuv.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/nuv.c b/libavformat/nuv.c index e360a64cfb..6c7c563b85 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -66,7 +66,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst, switch (frametype) { case NUV_EXTRADATA: subtype = avio_r8(pb); - url_fskip(pb, 6); + avio_seek(pb, 6, SEEK_CUR); size = PKTSIZE(avio_rl32(pb)); if (vst && subtype == 'R') { vst->codec->extradata_size = size; @@ -78,7 +78,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst, } break; case NUV_MYTHEXT: - url_fskip(pb, 7); + avio_seek(pb, 7, SEEK_CUR); size = PKTSIZE(avio_rl32(pb)); if (size != 128 * 4) break; @@ -90,7 +90,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst, if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G')) vst->codec->codec_id = CODEC_ID_NUV; } else - url_fskip(pb, 4); + avio_seek(pb, 4, SEEK_CUR); if (ast) { ast->codec->codec_tag = avio_rl32(pb); @@ -102,20 +102,20 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst, ast->codec->bits_per_coded_sample); ast->need_parsing = AVSTREAM_PARSE_FULL; } else - url_fskip(pb, 4 * 4); + avio_seek(pb, 4 * 4, SEEK_CUR); size -= 6 * 4; - url_fskip(pb, size); + avio_seek(pb, size, SEEK_CUR); return 1; case NUV_SEEKP: size = 11; break; default: - url_fskip(pb, 7); + avio_seek(pb, 7, SEEK_CUR); size = PKTSIZE(avio_rl32(pb)); break; } - url_fskip(pb, size); + avio_seek(pb, size, SEEK_CUR); } return 0; } @@ -130,14 +130,14 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { AVStream *vst = NULL, *ast = NULL; avio_read(pb, id_string, 12); is_mythtv = !memcmp(id_string, "MythTVVideo", 12); - url_fskip(pb, 5); // version string - url_fskip(pb, 3); // padding + avio_seek(pb, 5, SEEK_CUR); // version string + avio_seek(pb, 3, SEEK_CUR); // padding width = avio_rl32(pb); height = avio_rl32(pb); avio_rl32(pb); // unused, "desiredwidth" avio_rl32(pb); // unused, "desiredheight" avio_r8(pb); // 'P' == progressive, 'I' == interlaced - url_fskip(pb, 3); // padding + avio_seek(pb, 3, SEEK_CUR); // padding aspect = av_int2dbl(avio_rl64(pb)); if (aspect > 0.9999 && aspect < 1.0001) aspect = 4.0 / 3.0; @@ -206,13 +206,13 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { switch (frametype) { case NUV_EXTRADATA: if (!ctx->rtjpg_video) { - url_fskip(pb, size); + avio_seek(pb, size, SEEK_CUR); break; } case NUV_VIDEO: if (ctx->v_id < 0) { av_log(s, AV_LOG_ERROR, "Video packet in file without video stream!\n"); - url_fskip(pb, size); + avio_seek(pb, size, SEEK_CUR); break; } ret = av_new_packet(pkt, copyhdrsize + size); @@ -236,7 +236,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { case NUV_AUDIO: if (ctx->a_id < 0) { av_log(s, AV_LOG_ERROR, "Audio packet in file without audio stream!\n"); - url_fskip(pb, size); + avio_seek(pb, size, SEEK_CUR); break; } ret = av_get_packet(pb, pkt, size); @@ -250,7 +250,7 @@ static int nuv_packet(AVFormatContext *s, AVPacket *pkt) { // contains no data, size value is invalid break; default: - url_fskip(pb, size); + avio_seek(pb, size, SEEK_CUR); break; } } |