diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-03-04 21:41:59 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-03-20 20:12:16 +0100 |
| commit | 3c90cc2ef21a928a7c11cf5a4583169025cdf847 (patch) | |
| tree | f1cdaeec0d5115db10222ddb95c464b468821501 /libavformat/avidec.c | |
| parent | f63412fc741e9936b71141e7f15ab8aa39ad72f9 (diff) | |
| download | ffmpeg-3c90cc2ef21a928a7c11cf5a4583169025cdf847.tar.gz | |
lavf: deprecate av_read_packet().
The caller can achieve the same effect (i.e. getting raw unparsed/mangled
packets) with av_read_frame() and AVFMT_FLAG_NOPARSE |
AVFMT_FLAG_NOFILLIN
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 82db45abf3..abfea2c7ee 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -782,7 +782,7 @@ static int read_gab2_sub(AVStream *st, AVPacket *pkt) { ast->sub_ctx->pb = pb; if (!avformat_open_input(&ast->sub_ctx, "", sub_demuxer, NULL)) { - av_read_packet(ast->sub_ctx, &ast->sub_pkt); + ff_read_packet(ast->sub_ctx, &ast->sub_pkt); *st->codec = *ast->sub_ctx->streams[0]->codec; ast->sub_ctx->streams[0]->codec->extradata = NULL; time_base = ast->sub_ctx->streams[0]->time_base; @@ -824,7 +824,7 @@ static AVStream *get_subtitle_pkt(AVFormatContext *s, AVStream *next_st, ast = sub_st->priv_data; *pkt = ast->sub_pkt; pkt->stream_index = sub_st->index; - if (av_read_packet(ast->sub_ctx, &ast->sub_pkt) < 0) + if (ff_read_packet(ast->sub_ctx, &ast->sub_pkt) < 0) ast->sub_pkt.data = NULL; } return sub_st; @@ -1268,7 +1268,7 @@ static void seek_subtitle(AVStream *st, AVStream *st2, int64_t timestamp) av_free_packet(&ast2->sub_pkt); if (avformat_seek_file(ast2->sub_ctx, 0, INT64_MIN, ts2, ts2, 0) >= 0 || avformat_seek_file(ast2->sub_ctx, 0, ts2, ts2, INT64_MAX, 0) >= 0) - av_read_packet(ast2->sub_ctx, &ast2->sub_pkt); + ff_read_packet(ast2->sub_ctx, &ast2->sub_pkt); } static int avi_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) |