mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
lavf: Constify AVInputFormat pointer.
This commit is contained in:
parent
9461e4bc69
commit
3aa6208db9
@ -210,6 +210,7 @@ extern AVInputFormat ff_ivr_demuxer;
|
|||||||
extern AVInputFormat ff_jacosub_demuxer;
|
extern AVInputFormat ff_jacosub_demuxer;
|
||||||
extern AVOutputFormat ff_jacosub_muxer;
|
extern AVOutputFormat ff_jacosub_muxer;
|
||||||
extern AVInputFormat ff_jv_demuxer;
|
extern AVInputFormat ff_jv_demuxer;
|
||||||
|
extern AVInputFormat ff_kux_demuxer;
|
||||||
extern AVOutputFormat ff_latm_muxer;
|
extern AVOutputFormat ff_latm_muxer;
|
||||||
extern AVInputFormat ff_lmlm4_demuxer;
|
extern AVInputFormat ff_lmlm4_demuxer;
|
||||||
extern AVInputFormat ff_loas_demuxer;
|
extern AVInputFormat ff_loas_demuxer;
|
||||||
@ -583,7 +584,11 @@ AVInputFormat *av_iformat_next(const AVInputFormat *f)
|
|||||||
ff_thread_once(&av_format_next_init, av_format_init_next);
|
ff_thread_once(&av_format_next_init, av_format_init_next);
|
||||||
|
|
||||||
if (f)
|
if (f)
|
||||||
|
#if FF_API_AVIOFORMAT
|
||||||
return f->next;
|
return f->next;
|
||||||
|
#else
|
||||||
|
return (AVInputFormat *) f->next;
|
||||||
|
#endif
|
||||||
else {
|
else {
|
||||||
void *opaque = NULL;
|
void *opaque = NULL;
|
||||||
return (AVInputFormat *)av_demuxer_iterate(&opaque);
|
return (AVInputFormat *)av_demuxer_iterate(&opaque);
|
||||||
@ -595,7 +600,11 @@ AVOutputFormat *av_oformat_next(const AVOutputFormat *f)
|
|||||||
ff_thread_once(&av_format_next_init, av_format_init_next);
|
ff_thread_once(&av_format_next_init, av_format_init_next);
|
||||||
|
|
||||||
if (f)
|
if (f)
|
||||||
|
#if FF_API_AVIOFORMAT
|
||||||
return f->next;
|
return f->next;
|
||||||
|
#else
|
||||||
|
return (AVOutputFormat *) f->next;
|
||||||
|
#endif
|
||||||
else {
|
else {
|
||||||
void *opaque = NULL;
|
void *opaque = NULL;
|
||||||
return (AVOutputFormat *)av_muxer_iterate(&opaque);
|
return (AVOutputFormat *)av_muxer_iterate(&opaque);
|
||||||
|
@ -681,7 +681,7 @@ typedef struct AVInputFormat {
|
|||||||
* New public fields should be added right above.
|
* New public fields should be added right above.
|
||||||
*****************************************************************
|
*****************************************************************
|
||||||
*/
|
*/
|
||||||
struct AVInputFormat *next;
|
ff_const59 struct AVInputFormat *next;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Raw demuxers store their codec ID here.
|
* Raw demuxers store their codec ID here.
|
||||||
@ -1351,7 +1351,7 @@ typedef struct AVFormatContext {
|
|||||||
*
|
*
|
||||||
* Demuxing only, set by avformat_open_input().
|
* Demuxing only, set by avformat_open_input().
|
||||||
*/
|
*/
|
||||||
struct AVInputFormat *iformat;
|
ff_const59 struct AVInputFormat *iformat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The output container format.
|
* The output container format.
|
||||||
@ -2227,7 +2227,7 @@ int avformat_alloc_output_context2(AVFormatContext **ctx, ff_const59 AVOutputFor
|
|||||||
/**
|
/**
|
||||||
* Find AVInputFormat based on the short name of the input format.
|
* Find AVInputFormat based on the short name of the input format.
|
||||||
*/
|
*/
|
||||||
AVInputFormat *av_find_input_format(const char *short_name);
|
ff_const59 AVInputFormat *av_find_input_format(const char *short_name);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Guess the file format.
|
* Guess the file format.
|
||||||
@ -2236,7 +2236,7 @@ AVInputFormat *av_find_input_format(const char *short_name);
|
|||||||
* @param is_opened Whether the file is already opened; determines whether
|
* @param is_opened Whether the file is already opened; determines whether
|
||||||
* demuxers with or without AVFMT_NOFILE are probed.
|
* demuxers with or without AVFMT_NOFILE are probed.
|
||||||
*/
|
*/
|
||||||
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
|
ff_const59 AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Guess the file format.
|
* Guess the file format.
|
||||||
@ -2250,7 +2250,7 @@ AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened);
|
|||||||
* If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
|
* If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended
|
||||||
* to retry with a larger probe buffer.
|
* to retry with a larger probe buffer.
|
||||||
*/
|
*/
|
||||||
AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
|
ff_const59 AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Guess the file format.
|
* Guess the file format.
|
||||||
@ -2259,7 +2259,7 @@ AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score
|
|||||||
* demuxers with or without AVFMT_NOFILE are probed.
|
* demuxers with or without AVFMT_NOFILE are probed.
|
||||||
* @param score_ret The score of the best detection.
|
* @param score_ret The score of the best detection.
|
||||||
*/
|
*/
|
||||||
AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret);
|
ff_const59 AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score_ret);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Probe a bytestream to determine the input format. Each time a probe returns
|
* Probe a bytestream to determine the input format. Each time a probe returns
|
||||||
@ -2277,14 +2277,14 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score
|
|||||||
* the maximal score is AVPROBE_SCORE_MAX
|
* the maximal score is AVPROBE_SCORE_MAX
|
||||||
* AVERROR code otherwise
|
* AVERROR code otherwise
|
||||||
*/
|
*/
|
||||||
int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
|
int av_probe_input_buffer2(AVIOContext *pb, ff_const59 AVInputFormat **fmt,
|
||||||
const char *url, void *logctx,
|
const char *url, void *logctx,
|
||||||
unsigned int offset, unsigned int max_probe_size);
|
unsigned int offset, unsigned int max_probe_size);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Like av_probe_input_buffer2() but returns 0 on success
|
* Like av_probe_input_buffer2() but returns 0 on success
|
||||||
*/
|
*/
|
||||||
int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
|
int av_probe_input_buffer(AVIOContext *pb, ff_const59 AVInputFormat **fmt,
|
||||||
const char *url, void *logctx,
|
const char *url, void *logctx,
|
||||||
unsigned int offset, unsigned int max_probe_size);
|
unsigned int offset, unsigned int max_probe_size);
|
||||||
|
|
||||||
@ -2307,7 +2307,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
|
|||||||
*
|
*
|
||||||
* @note If you want to use custom IO, preallocate the format context and set its pb field.
|
* @note If you want to use custom IO, preallocate the format context and set its pb field.
|
||||||
*/
|
*/
|
||||||
int avformat_open_input(AVFormatContext **ps, const char *url, AVInputFormat *fmt, AVDictionary **options);
|
int avformat_open_input(AVFormatContext **ps, const char *url, ff_const59 AVInputFormat *fmt, AVDictionary **options);
|
||||||
|
|
||||||
attribute_deprecated
|
attribute_deprecated
|
||||||
int av_demuxer_open(AVFormatContext *ic);
|
int av_demuxer_open(AVFormatContext *ic);
|
||||||
|
@ -1068,7 +1068,7 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt)
|
|||||||
uint8_t desc[256];
|
uint8_t desc[256];
|
||||||
int score = AVPROBE_SCORE_EXTENSION, ret;
|
int score = AVPROBE_SCORE_EXTENSION, ret;
|
||||||
AVIStream *ast = st->priv_data;
|
AVIStream *ast = st->priv_data;
|
||||||
AVInputFormat *sub_demuxer;
|
ff_const59 AVInputFormat *sub_demuxer;
|
||||||
AVRational time_base;
|
AVRational time_base;
|
||||||
int size;
|
int size;
|
||||||
AVIOContext *pb = avio_alloc_context(pkt->data + 7,
|
AVIOContext *pb = avio_alloc_context(pkt->data + 7,
|
||||||
|
@ -1851,7 +1851,7 @@ static void close_demux_for_component(struct representation *pls)
|
|||||||
static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls)
|
static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls)
|
||||||
{
|
{
|
||||||
DASHContext *c = s->priv_data;
|
DASHContext *c = s->priv_data;
|
||||||
AVInputFormat *in_fmt = NULL;
|
ff_const59 AVInputFormat *in_fmt = NULL;
|
||||||
AVDictionary *in_fmt_opts = NULL;
|
AVDictionary *in_fmt_opts = NULL;
|
||||||
uint8_t *avio_ctx_buffer = NULL;
|
uint8_t *avio_ctx_buffer = NULL;
|
||||||
int ret = 0, i;
|
int ret = 0, i;
|
||||||
|
@ -115,7 +115,7 @@ enum AVCodecID av_guess_codec(ff_const59 AVOutputFormat *fmt, const char *short_
|
|||||||
return AV_CODEC_ID_NONE;
|
return AV_CODEC_ID_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
AVInputFormat *av_find_input_format(const char *short_name)
|
ff_const59 AVInputFormat *av_find_input_format(const char *short_name)
|
||||||
{
|
{
|
||||||
const AVInputFormat *fmt = NULL;
|
const AVInputFormat *fmt = NULL;
|
||||||
void *i = 0;
|
void *i = 0;
|
||||||
@ -125,12 +125,12 @@ AVInputFormat *av_find_input_format(const char *short_name)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
|
ff_const59 AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
|
||||||
int *score_ret)
|
int *score_ret)
|
||||||
{
|
{
|
||||||
AVProbeData lpd = *pd;
|
AVProbeData lpd = *pd;
|
||||||
const AVInputFormat *fmt1 = NULL;
|
const AVInputFormat *fmt1 = NULL;
|
||||||
AVInputFormat *fmt = NULL;
|
ff_const59 AVInputFormat *fmt = NULL;
|
||||||
int score, score_max = 0;
|
int score, score_max = 0;
|
||||||
void *i = 0;
|
void *i = 0;
|
||||||
const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE];
|
const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE];
|
||||||
@ -202,10 +202,10 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
|
|||||||
return fmt;
|
return fmt;
|
||||||
}
|
}
|
||||||
|
|
||||||
AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
|
ff_const59 AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
|
||||||
{
|
{
|
||||||
int score_ret;
|
int score_ret;
|
||||||
AVInputFormat *fmt = av_probe_input_format3(pd, is_opened, &score_ret);
|
ff_const59 AVInputFormat *fmt = av_probe_input_format3(pd, is_opened, &score_ret);
|
||||||
if (score_ret > *score_max) {
|
if (score_ret > *score_max) {
|
||||||
*score_max = score_ret;
|
*score_max = score_ret;
|
||||||
return fmt;
|
return fmt;
|
||||||
@ -213,13 +213,13 @@ AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
|
ff_const59 AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
|
||||||
{
|
{
|
||||||
int score = 0;
|
int score = 0;
|
||||||
return av_probe_input_format2(pd, is_opened, &score);
|
return av_probe_input_format2(pd, is_opened, &score);
|
||||||
}
|
}
|
||||||
|
|
||||||
int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
|
int av_probe_input_buffer2(AVIOContext *pb, ff_const59 AVInputFormat **fmt,
|
||||||
const char *filename, void *logctx,
|
const char *filename, void *logctx,
|
||||||
unsigned int offset, unsigned int max_probe_size)
|
unsigned int offset, unsigned int max_probe_size)
|
||||||
{
|
{
|
||||||
@ -309,7 +309,7 @@ fail:
|
|||||||
return ret < 0 ? ret : score;
|
return ret < 0 ? ret : score;
|
||||||
}
|
}
|
||||||
|
|
||||||
int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
|
int av_probe_input_buffer(AVIOContext *pb, ff_const59 AVInputFormat **fmt,
|
||||||
const char *filename, void *logctx,
|
const char *filename, void *logctx,
|
||||||
unsigned int offset, unsigned int max_probe_size)
|
unsigned int offset, unsigned int max_probe_size)
|
||||||
{
|
{
|
||||||
|
@ -1868,7 +1868,7 @@ static int hls_read_header(AVFormatContext *s)
|
|||||||
/* Open the demuxer for each playlist */
|
/* Open the demuxer for each playlist */
|
||||||
for (i = 0; i < c->n_playlists; i++) {
|
for (i = 0; i < c->n_playlists; i++) {
|
||||||
struct playlist *pls = c->playlists[i];
|
struct playlist *pls = c->playlists[i];
|
||||||
AVInputFormat *in_fmt = NULL;
|
ff_const59 AVInputFormat *in_fmt = NULL;
|
||||||
|
|
||||||
if (!(pls->ctx = avformat_alloc_context())) {
|
if (!(pls->ctx = avformat_alloc_context())) {
|
||||||
ret = AVERROR(ENOMEM);
|
ret = AVERROR(ENOMEM);
|
||||||
|
@ -424,7 +424,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
|
|||||||
|
|
||||||
if (par->codec_id == AV_CODEC_ID_NONE) {
|
if (par->codec_id == AV_CODEC_ID_NONE) {
|
||||||
AVProbeData pd = { 0 };
|
AVProbeData pd = { 0 };
|
||||||
AVInputFormat *ifmt;
|
const AVInputFormat *ifmt;
|
||||||
uint8_t header[PROBE_BUF_MIN + AVPROBE_PADDING_SIZE];
|
uint8_t header[PROBE_BUF_MIN + AVPROBE_PADDING_SIZE];
|
||||||
int ret;
|
int ret;
|
||||||
int score = 0;
|
int score = 0;
|
||||||
|
@ -722,7 +722,7 @@ static int vobsub_read_header(AVFormatContext *s)
|
|||||||
int stream_id = -1;
|
int stream_id = -1;
|
||||||
char id[64] = {0};
|
char id[64] = {0};
|
||||||
char alt[MAX_LINE_SIZE] = {0};
|
char alt[MAX_LINE_SIZE] = {0};
|
||||||
AVInputFormat *iformat;
|
ff_const59 AVInputFormat *iformat;
|
||||||
|
|
||||||
if (!vobsub->sub_name) {
|
if (!vobsub->sub_name) {
|
||||||
char *ext;
|
char *ext;
|
||||||
|
@ -106,7 +106,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
|
|||||||
AVDictionary *opts = NULL;
|
AVDictionary *opts = NULL;
|
||||||
int len = strlen(p) * 6 / 8;
|
int len = strlen(p) * 6 / 8;
|
||||||
char *buf = av_mallocz(len);
|
char *buf = av_mallocz(len);
|
||||||
AVInputFormat *iformat;
|
ff_const59 AVInputFormat *iformat;
|
||||||
|
|
||||||
if (!buf)
|
if (!buf)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
@ -68,7 +68,7 @@ static int sap_read_header(AVFormatContext *s)
|
|||||||
uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
|
uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
|
||||||
int port;
|
int port;
|
||||||
int ret, i;
|
int ret, i;
|
||||||
AVInputFormat* infmt;
|
ff_const59 AVInputFormat* infmt;
|
||||||
|
|
||||||
if (!ff_network_init())
|
if (!ff_network_init())
|
||||||
return AVERROR(EIO);
|
return AVERROR(EIO);
|
||||||
|
@ -357,7 +357,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
|
|||||||
{ 0 }
|
{ 0 }
|
||||||
};
|
};
|
||||||
int score;
|
int score;
|
||||||
AVInputFormat *fmt = av_probe_input_format3(pd, 1, &score);
|
const AVInputFormat *fmt = av_probe_input_format3(pd, 1, &score);
|
||||||
|
|
||||||
if (fmt) {
|
if (fmt) {
|
||||||
int i;
|
int i;
|
||||||
@ -535,7 +535,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|||||||
|
|
||||||
|
|
||||||
int avformat_open_input(AVFormatContext **ps, const char *filename,
|
int avformat_open_input(AVFormatContext **ps, const char *filename,
|
||||||
AVInputFormat *fmt, AVDictionary **options)
|
ff_const59 AVInputFormat *fmt, AVDictionary **options)
|
||||||
{
|
{
|
||||||
AVFormatContext *s = *ps;
|
AVFormatContext *s = *ps;
|
||||||
int i, ret = 0;
|
int i, ret = 0;
|
||||||
@ -2163,7 +2163,7 @@ static int64_t ff_read_timestamp(AVFormatContext *s, int stream_index, int64_t *
|
|||||||
int ff_seek_frame_binary(AVFormatContext *s, int stream_index,
|
int ff_seek_frame_binary(AVFormatContext *s, int stream_index,
|
||||||
int64_t target_ts, int flags)
|
int64_t target_ts, int flags)
|
||||||
{
|
{
|
||||||
AVInputFormat *avif = s->iformat;
|
const AVInputFormat *avif = s->iformat;
|
||||||
int64_t av_uninit(pos_min), av_uninit(pos_max), pos, pos_limit;
|
int64_t av_uninit(pos_min), av_uninit(pos_max), pos, pos_limit;
|
||||||
int64_t ts_min, ts_max, ts;
|
int64_t ts_min, ts_max, ts;
|
||||||
int index;
|
int index;
|
||||||
|
Loading…
Reference in New Issue
Block a user