From 215b7724e7ef332eab5aff8d1ab6b77a11f47c4f Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Sat, 3 Dec 2011 00:45:46 +0100 Subject: lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). --- libavdevice/alsa-audio-enc.c | 3 ++- libavdevice/dshow.c | 4 ++-- libavdevice/lavfi.c | 3 ++- libavdevice/openal-dec.c | 3 ++- libavformat/act.c | 3 ++- libavformat/bintext.c | 5 +++-- libavformat/bit.c | 3 ++- libavformat/electronicarts.c | 2 +- libavformat/g723_1.c | 3 ++- libavformat/g729dec.c | 3 ++- libavformat/libmodplug.c | 5 +++-- libavformat/loasdec.c | 3 ++- libavformat/microdvddec.c | 2 +- libavformat/mkvtimestamp_v2.c | 3 ++- libavformat/pmpdec.c | 5 +++-- libavformat/wav.c | 2 +- libavformat/wtvdec.c | 2 +- libavformat/wtvenc.c | 2 +- 18 files changed, 34 insertions(+), 22 deletions(-) diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa-audio-enc.c index 446d7a24e5..fd013160d6 100644 --- a/libavdevice/alsa-audio-enc.c +++ b/libavdevice/alsa-audio-enc.c @@ -39,6 +39,7 @@ #include +#include "libavformat/internal.h" #include "avdevice.h" #include "alsa-audio.h" @@ -61,7 +62,7 @@ static av_cold int audio_write_header(AVFormatContext *s1) st->codec->sample_rate, sample_rate); goto fail; } - av_set_pts_info(st, 64, 1, sample_rate); + avpriv_set_pts_info(st, 64, 1, sample_rate); return res; diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index bba1bbaffb..61f0d08a2f 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -21,7 +21,7 @@ #include "libavutil/parseutils.h" #include "libavutil/opt.h" - +#include "libavformat/internal.h" #include "avdevice.h" #include "dshow.h" @@ -739,7 +739,7 @@ dshow_add_device(AVFormatContext *avctx, AVFormatParameters *ap, codec->channels = fx->nChannels; } - av_set_pts_info(st, 64, 1, 10000000); + avpriv_set_pts_info(st, 64, 1, 10000000); ret = 0; diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index cce09c5592..04dc3b233c 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -35,6 +35,7 @@ #include "libavfilter/avfilter.h" #include "libavfilter/avfiltergraph.h" #include "libavfilter/buffersink.h" +#include "libavformat/internal.h" #include "avdevice.h" typedef struct { @@ -231,7 +232,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx, AVFilterLink *link = lavfi->sinks[lavfi->stream_sink_map[i]]->inputs[0]; AVStream *st = avctx->streams[i]; st->codec->codec_type = link->type; - av_set_pts_info(st, 64, link->time_base.num, link->time_base.den); + avpriv_set_pts_info(st, 64, link->time_base.num, link->time_base.den); if (link->type == AVMEDIA_TYPE_VIDEO) { st->codec->codec_id = CODEC_ID_RAWVIDEO; st->codec->pix_fmt = link->format; diff --git a/libavdevice/openal-dec.c b/libavdevice/openal-dec.c index 77b63b5695..17256ca066 100644 --- a/libavdevice/openal-dec.c +++ b/libavdevice/openal-dec.c @@ -25,6 +25,7 @@ #include #include "libavutil/opt.h" +#include "libavformat/internal.h" #include "avdevice.h" typedef struct { @@ -151,7 +152,7 @@ static int read_header(AVFormatContext *ctx, AVFormatParameters *ap) } /* We work in microseconds */ - av_set_pts_info(st, 64, 1, 1000000); + avpriv_set_pts_info(st, 64, 1, 1000000); /* Set codec parameters */ codec = st->codec; diff --git a/libavformat/act.c b/libavformat/act.c index 0c41ba0340..5c414f04e9 100644 --- a/libavformat/act.c +++ b/libavformat/act.c @@ -20,6 +20,7 @@ */ #include "avformat.h" #include "riff.h" +#include "internal.h" #include "libavcodec/get_bits.h" #define CHUNK_SIZE 512 @@ -88,7 +89,7 @@ static int read_header(AVFormatContext *s, st->codec->frame_size=80; st->codec->channels=1; - av_set_pts_info(st, 64, 1, 100); + avpriv_set_pts_info(st, 64, 1, 100); st->codec->codec_id=CODEC_ID_G729; diff --git a/libavformat/bintext.c b/libavformat/bintext.c index a39ab291e4..1c84092cbc 100644 --- a/libavformat/bintext.c +++ b/libavformat/bintext.c @@ -32,6 +32,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" #include "sauce.h" #include "libavcodec/bintext.h" @@ -109,9 +110,9 @@ static AVStream * init_stream(AVFormatContext *s, st->codec->codec_type = AVMEDIA_TYPE_VIDEO; if (!ap->time_base.num) { - av_set_pts_info(st, 60, 1, 25); + avpriv_set_pts_info(st, 60, 1, 25); } else { - av_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den); + avpriv_set_pts_info(st, 60, ap->time_base.num, ap->time_base.den); } /* simulate tty display speed */ diff --git a/libavformat/bit.c b/libavformat/bit.c index 39052380d9..3449ce1b21 100644 --- a/libavformat/bit.c +++ b/libavformat/bit.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" +#include "internal.h" #include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" @@ -60,7 +61,7 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) st->codec->block_align = 16; st->codec->channels=1; - av_set_pts_info(st, 64, 1, 100); + avpriv_set_pts_info(st, 64, 1, 100); return 0; } diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 802352a852..75f92afc0f 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -420,7 +420,7 @@ static int ea_read_header(AVFormatContext *s, st->need_parsing = AVSTREAM_PARSE_HEADERS; st->codec->codec_tag = 0; /* no fourcc */ if (ea->time_base.num) - av_set_pts_info(st, 64, ea->time_base.num, ea->time_base.den); + avpriv_set_pts_info(st, 64, ea->time_base.num, ea->time_base.den); st->codec->width = ea->width; st->codec->height = ea->height; } diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index 09fd6141fc..86ef540edf 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -25,6 +25,7 @@ */ #include "avformat.h" +#include "internal.h" static const uint8_t frame_size[4] = {24, 20, 4, 1}; @@ -41,7 +42,7 @@ static int g723_1_init(AVFormatContext *s, AVFormatParameters *ap) st->codec->channels = 1; st->codec->sample_rate = 8000; - av_set_pts_info(st, 64, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); return 0; } diff --git a/libavformat/g729dec.c b/libavformat/g729dec.c index 512c04ec10..82b1198c55 100644 --- a/libavformat/g729dec.c +++ b/libavformat/g729dec.c @@ -20,6 +20,7 @@ */ #include "avformat.h" +#include "internal.h" #include "libavutil/log.h" #include "libavutil/opt.h" @@ -60,7 +61,7 @@ static int g729_read_header(AVFormatContext *s, AVFormatParameters *ap) return AVERROR_INVALIDDATA; } - av_set_pts_info(st, st->codec->block_align << 3, 1, st->codec->sample_rate); + avpriv_set_pts_info(st, st->codec->block_align << 3, 1, st->codec->sample_rate); return 0; } static int g729_read_packet(AVFormatContext *s, AVPacket *pkt) diff --git a/libavformat/libmodplug.c b/libavformat/libmodplug.c index ec9acd6c92..dfbf67c2d2 100644 --- a/libavformat/libmodplug.c +++ b/libavformat/libmodplug.c @@ -27,6 +27,7 @@ #include "libavutil/eval.h" #include "libavutil/opt.h" #include "avformat.h" +#include "internal.h" typedef struct ModPlugContext { const AVClass *class; @@ -220,7 +221,7 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap) st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - av_set_pts_info(st, 64, 1, 1000); + avpriv_set_pts_info(st, 64, 1, 1000); st->duration = ModPlug_GetLength(modplug->f); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_PCM_S16LE; @@ -234,7 +235,7 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap) AVStream *vst = avformat_new_stream(s, NULL); if (!vst) return AVERROR(ENOMEM); - av_set_pts_info(vst, 64, 1, 1000); + avpriv_set_pts_info(vst, 64, 1, 1000); vst->duration = st->duration; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; vst->codec->codec_id = CODEC_ID_XBIN; diff --git a/libavformat/loasdec.c b/libavformat/loasdec.c index f3019420d1..e48c21905a 100644 --- a/libavformat/loasdec.c +++ b/libavformat/loasdec.c @@ -22,6 +22,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/internal.h" #include "avformat.h" +#include "internal.h" #include "rawdec.h" static int loas_probe(AVProbeData *p) @@ -72,7 +73,7 @@ static int loas_read_header(AVFormatContext *s, st->need_parsing = AVSTREAM_PARSE_FULL; //LCM of all possible AAC sample rates - av_set_pts_info(st, 64, 1, 28224000); + avpriv_set_pts_info(st, 64, 1, 28224000); return 0; } diff --git a/libavformat/microdvddec.c b/libavformat/microdvddec.c index 4c56a7f503..748ebdfc48 100644 --- a/libavformat/microdvddec.c +++ b/libavformat/microdvddec.c @@ -74,7 +74,7 @@ static int microdvd_read_header(AVFormatContext *s, AVFormatParameters *ap) i--; } } - av_set_pts_info(st, 64, pts_info.den, pts_info.num); + avpriv_set_pts_info(st, 64, pts_info.den, pts_info.num); st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codec->codec_id = CODEC_ID_MICRODVD; return 0; diff --git a/libavformat/mkvtimestamp_v2.c b/libavformat/mkvtimestamp_v2.c index ebb209ba64..f120460057 100644 --- a/libavformat/mkvtimestamp_v2.c +++ b/libavformat/mkvtimestamp_v2.c @@ -20,12 +20,13 @@ */ #include "avformat.h" +#include "internal.h" static int write_header(AVFormatContext *s) { static const char *header = "# timecode format v2\n"; put_buffer(s->pb, header, strlen(header)); - av_set_pts_info(s->streams[0], 64, 1, 1000); + avpriv_set_pts_info(s->streams[0], 64, 1, 1000); return 0; } diff --git a/libavformat/pmpdec.c b/libavformat/pmpdec.c index 3d54484314..a57b66072e 100644 --- a/libavformat/pmpdec.c +++ b/libavformat/pmpdec.c @@ -21,6 +21,7 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "internal.h" typedef struct { int cur_stream; @@ -70,7 +71,7 @@ static int pmp_header(AVFormatContext *s, AVFormatParameters *ap) tb_num = avio_rl32(pb); tb_den = avio_rl32(pb); - av_set_pts_info(vst, 32, tb_num, tb_den); + avpriv_set_pts_info(vst, 32, tb_num, tb_den); vst->nb_frames = index_cnt; vst->duration = index_cnt; @@ -98,7 +99,7 @@ static int pmp_header(AVFormatContext *s, AVFormatParameters *ap) ast->codec->codec_id = audio_codec_id; ast->codec->channels = channels; ast->codec->sample_rate = srate; - av_set_pts_info(ast, 32, 1, srate); + avpriv_set_pts_info(ast, 32, 1, srate); } pos = avio_tell(pb) + 4*index_cnt; for (i = 0; i < index_cnt; i++) { diff --git a/libavformat/wav.c b/libavformat/wav.c index 053c855fd4..b9a8f4038a 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -498,7 +498,7 @@ static int wav_read_header(AVFormatContext *s, wav->smv_data_ofs = avio_tell(pb) + (size - 5) * 3; avio_rl24(pb); wav->smv_block_size = avio_rl24(pb); - av_set_pts_info(vst, 32, 1, avio_rl24(pb)); + avpriv_set_pts_info(vst, 32, 1, avio_rl24(pb)); vst->duration = avio_rl24(pb); avio_rl24(pb); avio_rl24(pb); diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 35114416aa..cd65ce54a5 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -570,7 +570,7 @@ static AVStream * new_stream(AVFormatContext *s, AVStream *st, int sid, int code } st->codec->codec_type = codec_type; st->need_parsing = AVSTREAM_PARSE_FULL; - av_set_pts_info(st, 64, 1, 10000000); + avpriv_set_pts_info(st, 64, 1, 10000000); return st; } diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 3fdda94ffb..be83c54f71 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -327,7 +327,7 @@ static int write_stream_data(AVFormatContext *s, AVStream *st, int flag) } finish_chunk(s); - av_set_pts_info(st, 64, 1, 10000000); + avpriv_set_pts_info(st, 64, 1, 10000000); return 0; } -- cgit v1.2.3