Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: Constify AVInputFormat pointer.

Browse Source
pull/310/head
Carl Eugen Hoyos 6 years ago
parent 9461e4bc69
commit 3aa6208db9
11 changed files with 36 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      libavformat/allformats.c
  2. 18
      libavformat/avformat.h
  3. 2
      libavformat/avidec.c
  4. 2
      libavformat/dashdec.c
  5. 16
      libavformat/format.c
  6. 2
      libavformat/hls.c
  7. 2
      libavformat/img2dec.c
  8. 2
      libavformat/mpeg.c
  9. 2
      libavformat/rtpdec_asf.c
  10. 2
      libavformat/sapdec.c
  11. 6
      libavformat/utils.c

9
libavformat/allformats.c
Unescape View File

@ -210,6 +210,7 @@ extern AVInputFormat ff_ivr_demuxer;
extern AVInputFormat ff_jacosub_demuxer;
extern AVOutputFormat ff_jacosub_muxer;
extern AVInputFormat ff_jv_demuxer;
extern AVInputFormat ff_kux_demuxer;
extern AVOutputFormat ff_latm_muxer;
extern AVInputFormat ff_lmlm4_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);
if (f)
#if FF_API_AVIOFORMAT
return f->next;
#else
return (AVInputFormat *) f->next;
#endif
else {
void *opaque = NULL;
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);
if (f)
#if FF_API_AVIOFORMAT
return f->next;
#else
return (AVOutputFormat *) f->next;
#endif
else {
void *opaque = NULL;
return (AVOutputFormat *)av_muxer_iterate(&opaque);

18
libavformat/avformat.h
Unescape View File

@ -681,7 +681,7 @@ typedef struct AVInputFormat {
* New public fields should be added right above.
*****************************************************************
*/
struct AVInputFormat *next;
ff_const59 struct AVInputFormat *next;
/**
* Raw demuxers store their codec ID here.
@ -1351,7 +1351,7 @@ typedef struct AVFormatContext {
*
* Demuxing only, set by avformat_open_input().
*/
struct AVInputFormat *iformat;
ff_const59 struct AVInputFormat *iformat;
/**
* 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.
*/
AVInputFormat *av_find_input_format(const char *short_name);
ff_const59 AVInputFormat *av_find_input_format(const char *short_name);
/**
* 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
* 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.
@ -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
* 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.
@ -2259,7 +2259,7 @@ AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score
* demuxers with or without AVFMT_NOFILE are probed.
* @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
@ -2277,14 +2277,14 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score
* the maximal score is AVPROBE_SCORE_MAX
* 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,
unsigned int offset, unsigned int max_probe_size);
/**
* 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,
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.
*/
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
int av_demuxer_open(AVFormatContext *ic);

2
libavformat/avidec.c
Unescape View File

@ -1068,7 +1068,7 @@ static int read_gab2_sub(AVFormatContext *s, AVStream *st, AVPacket *pkt)
uint8_t desc[256];
int score = AVPROBE_SCORE_EXTENSION, ret;
AVIStream *ast = st->priv_data;
AVInputFormat *sub_demuxer;
ff_const59 AVInputFormat *sub_demuxer;
AVRational time_base;
int size;
AVIOContext *pb = avio_alloc_context(pkt->data + 7,

2
libavformat/dashdec.c
Unescape View File

@ -1851,7 +1851,7 @@ static void close_demux_for_component(struct representation *pls)
static int reopen_demux_for_component(AVFormatContext *s, struct representation *pls)
{
DASHContext *c = s->priv_data;
AVInputFormat *in_fmt = NULL;
ff_const59 AVInputFormat *in_fmt = NULL;
AVDictionary *in_fmt_opts = NULL;
uint8_t *avio_ctx_buffer = NULL;
int ret = 0, i;

16
libavformat/format.c
Unescape View File

@ -115,7 +115,7 @@ enum AVCodecID av_guess_codec(ff_const59 AVOutputFormat *fmt, const char *short_
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;
void *i = 0;
@ -125,12 +125,12 @@ AVInputFormat *av_find_input_format(const char *short_name)
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)
{
AVProbeData lpd = *pd;
const AVInputFormat *fmt1 = NULL;
AVInputFormat *fmt = NULL;
ff_const59 AVInputFormat *fmt = NULL;
int score, score_max = 0;
void *i = 0;
const static uint8_t zerobuffer[AVPROBE_PADDING_SIZE];
@ -202,10 +202,10 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened,
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;
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) {
*score_max = score_ret;
return fmt;
@ -213,13 +213,13 @@ AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score
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;
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,
unsigned int offset, unsigned int max_probe_size)
{
@ -309,7 +309,7 @@ fail:
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,
unsigned int offset, unsigned int max_probe_size)
{

2
libavformat/hls.c
Unescape View File

@ -1868,7 +1868,7 @@ static int hls_read_header(AVFormatContext *s)
/* Open the demuxer for each playlist */
for (i = 0; i < c->n_playlists; i++) {
struct playlist *pls = c->playlists[i];
AVInputFormat *in_fmt = NULL;
ff_const59 AVInputFormat *in_fmt = NULL;
if (!(pls->ctx = avformat_alloc_context())) {
ret = AVERROR(ENOMEM);

2
libavformat/img2dec.c
Unescape View File

@ -424,7 +424,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (par->codec_id == AV_CODEC_ID_NONE) {
AVProbeData pd = { 0 };
AVInputFormat *ifmt;
const AVInputFormat *ifmt;
uint8_t header[PROBE_BUF_MIN + AVPROBE_PADDING_SIZE];
int ret;
int score = 0;

2
libavformat/mpeg.c
Unescape View File

@ -722,7 +722,7 @@ static int vobsub_read_header(AVFormatContext *s)
int stream_id = -1;
char id[64] = {0};
char alt[MAX_LINE_SIZE] = {0};
AVInputFormat *iformat;
ff_const59 AVInputFormat *iformat;
if (!vobsub->sub_name) {
char *ext;

2
libavformat/rtpdec_asf.c
Unescape View File

@ -106,7 +106,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
AVDictionary *opts = NULL;
int len = strlen(p) * 6 / 8;
char *buf = av_mallocz(len);
AVInputFormat *iformat;
ff_const59 AVInputFormat *iformat;
if (!buf)
return AVERROR(ENOMEM);

2
libavformat/sapdec.c
Unescape View File

@ -68,7 +68,7 @@ static int sap_read_header(AVFormatContext *s)
uint8_t recvbuf[RTP_MAX_PACKET_LENGTH];
int port;
int ret, i;
AVInputFormat* infmt;
ff_const59 AVInputFormat* infmt;
if (!ff_network_init())
return AVERROR(EIO);

6
libavformat/utils.c
Unescape View File

@ -357,7 +357,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
{ 0 }
};
int score;
AVInputFormat *fmt = av_probe_input_format3(pd, 1, &score);
const AVInputFormat *fmt = av_probe_input_format3(pd, 1, &score);
if (fmt) {
int i;
@ -535,7 +535,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
int avformat_open_input(AVFormatContext **ps, const char *filename,
AVInputFormat *fmt, AVDictionary **options)
ff_const59 AVInputFormat *fmt, AVDictionary **options)
{
AVFormatContext *s = *ps;
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,
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 ts_min, ts_max, ts;
int index;

Write Preview
Loading…
Cancel
Save