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

lavf: remove AVFormatParameters from AVFormatContext.read_header signature

Browse Source
pull/3/merge
Anton Khirnov 13 years ago
parent 3b4aaa6190
commit 6e9651d106
129 changed files with 147 additions and 202 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libavdevice/alsa-audio-dec.c
  2. 2
      libavdevice/bktr.c
  3. 2
      libavdevice/dv1394.c
  4. 3
      libavdevice/fbdev.c
  5. 2
      libavdevice/jack_audio.c
  6. 2
      libavdevice/libcdio.c
  7. 10
      libavdevice/libdc1394.c
  8. 2
      libavdevice/oss_audio.c
  9. 3
      libavdevice/pulse.c
  10. 3
      libavdevice/sndio_dec.c
  11. 6
      libavdevice/v4l2.c
  12. 2
      libavdevice/vfwcap.c
  13. 2
      libavdevice/x11grab.c
  14. 3
      libavformat/4xm.c
  15. 3
      libavformat/aacdec.c
  16. 2
      libavformat/adxdec.c
  17. 3
      libavformat/aea.c
  18. 3
      libavformat/aiffdec.c
  19. 3
      libavformat/amr.c
  20. 3
      libavformat/anm.c
  21. 2
      libavformat/apc.c
  22. 2
      libavformat/ape.c
  23. 2
      libavformat/applehttp.c
  24. 2
      libavformat/asfdec.c
  25. 2
      libavformat/assdec.c
  26. 3
      libavformat/au.c
  27. 3
      libavformat/avformat.h
  28. 2
      libavformat/avidec.c
  29. 2
      libavformat/avisynth.c
  30. 2
      libavformat/avs.c
  31. 3
      libavformat/bethsoftvid.c
  32. 2
      libavformat/bfi.c
  33. 2
      libavformat/bink.c
  34. 2
      libavformat/bmv.c
  35. 3
      libavformat/c93.c
  36. 3
      libavformat/cafdec.c
  37. 2
      libavformat/cdg.c
  38. 2
      libavformat/daud.c
  39. 3
      libavformat/dfa.c
  40. 2
      libavformat/dsicin.c
  41. 3
      libavformat/dv.c
  42. 2
      libavformat/dxa.c
  43. 2
      libavformat/eacdata.c
  44. 3
      libavformat/electronicarts.c
  45. 2
      libavformat/ffmdec.c
  46. 2
      libavformat/ffmetadec.c
  47. 3
      libavformat/filmstripdec.c
  48. 3
      libavformat/flacdec.c
  49. 3
      libavformat/flic.c
  50. 3
      libavformat/flvdec.c
  51. 2
      libavformat/gsmdec.c
  52. 2
      libavformat/gxf.c
  53. 3
      libavformat/idcin.c
  54. 3
      libavformat/idroqdec.c
  55. 3
      libavformat/iff.c
  56. 2
      libavformat/img2.c
  57. 3
      libavformat/ipmovie.c
  58. 2
      libavformat/iss.c
  59. 2
      libavformat/iv8.c
  60. 2
      libavformat/ivfdec.c
  61. 3
      libavformat/jvdec.c
  62. 2
      libavformat/libnut.c
  63. 2
      libavformat/lmlm4.c
  64. 2
      libavformat/lxfdec.c
  65. 2
      libavformat/matroskadec.c
  66. 3
      libavformat/mm.c
  67. 3
      libavformat/mmf.c
  68. 2
      libavformat/mov.c
  69. 3
      libavformat/mp3dec.c
  70. 2
      libavformat/mpc.c
  71. 2
      libavformat/mpc8.c
  72. 3
      libavformat/mpeg.c
  73. 3
      libavformat/mpegts.c
  74. 2
      libavformat/msnwc_tcp.c
  75. 2
      libavformat/mtv.c
  76. 2
      libavformat/mvi.c
  77. 2
      libavformat/mxfdec.c
  78. 2
      libavformat/mxg.c
  79. 2
      libavformat/ncdec.c
  80. 12
      libavformat/nsvdec.c
  81. 2
      libavformat/nutdec.c
  82. 2
      libavformat/nuv.c
  83. 2
      libavformat/oggdec.c
  84. 3
      libavformat/omadec.c
  85. 2
      libavformat/pmpdec.c
  86. 3
      libavformat/psxstr.c
  87. 2
      libavformat/pva.c
  88. 2
      libavformat/qcp.c
  89. 2
      libavformat/r3d.c
  90. 8
      libavformat/rawdec.c
  91. 6
      libavformat/rawdec.h
  92. 3
      libavformat/rl2.c
  93. 2
      libavformat/rmdec.c
  94. 2
      libavformat/rpl.c
  95. 2
      libavformat/rsodec.c
  96. 7
      libavformat/rtsp.c
  97. 3
      libavformat/rtspdec.c
  98. 3
      libavformat/sapdec.c
  99. 3
      libavformat/segafilm.c
  100. 3
      libavformat/sierravmd.c
  101. Some files were not shown because too many files have changed in this diff Show More

3
libavdevice/alsa-audio-dec.c
Unescape View File

@ -52,8 +52,7 @@
#include "alsa-audio.h" #include "alsa-audio.h"
static av_cold int audio_read_header(AVFormatContext *s1, static av_cold int audio_read_header(AVFormatContext *s1)
AVFormatParameters *ap)
{ {
AlsaData *s = s1->priv_data; AlsaData *s = s1->priv_data;
AVStream *st; AVStream *st;

2
libavdevice/bktr.c
Unescape View File

@ -243,7 +243,7 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
return video_buf_size; return video_buf_size;
} }
static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) static int grab_read_header(AVFormatContext *s1)
{ {
VideoData *s = s1->priv_data; VideoData *s = s1->priv_data;
AVStream *st; AVStream *st;

2
libavdevice/dv1394.c
Unescape View File

@ -81,7 +81,7 @@ static int dv1394_start(struct dv1394_data *dv)
return 0; return 0;
} }
static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap) static int dv1394_read_header(AVFormatContext * context)
{ {
struct dv1394_data *dv = context->priv_data; struct dv1394_data *dv = context->priv_data;

3
libavdevice/fbdev.c
Unescape View File

@ -95,8 +95,7 @@ typedef struct {
uint8_t *data; ///< framebuffer data uint8_t *data; ///< framebuffer data
} FBDevContext; } FBDevContext;
av_cold static int fbdev_read_header(AVFormatContext *avctx, av_cold static int fbdev_read_header(AVFormatContext *avctx)
AVFormatParameters *ap)
{ {
FBDevContext *fbdev = avctx->priv_data; FBDevContext *fbdev = avctx->priv_data;
AVStream *st = NULL; AVStream *st = NULL;

2
libavdevice/jack_audio.c
Unescape View File

@ -221,7 +221,7 @@ static void stop_jack(JackData *self)
ff_timefilter_destroy(self->timefilter); ff_timefilter_destroy(self->timefilter);
} }
static int audio_read_header(AVFormatContext *context, AVFormatParameters *params) static int audio_read_header(AVFormatContext *context)
{ {
JackData *self = context->priv_data; JackData *self = context->priv_data;
AVStream *stream; AVStream *stream;

2
libavdevice/libcdio.c
Unescape View File

@ -46,7 +46,7 @@ typedef struct CDIOContext {
int paranoia_mode; int paranoia_mode;
} CDIOContext; } CDIOContext;
static av_cold int read_header(AVFormatContext *ctx, AVFormatParameters *ap) static av_cold int read_header(AVFormatContext *ctx)
{ {
CDIOContext *s = ctx->priv_data; CDIOContext *s = ctx->priv_data;
AVStream *st; AVStream *st;

10
libavdevice/libdc1394.c
Unescape View File

@ -117,7 +117,7 @@ static const AVClass libdc1394_class = {
}; };
static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap, static inline int dc1394_read_common(AVFormatContext *c,
struct dc1394_frame_format **select_fmt, struct dc1394_frame_rate **select_fps) struct dc1394_frame_format **select_fmt, struct dc1394_frame_rate **select_fps)
{ {
dc1394_data* dc1394 = c->priv_data; dc1394_data* dc1394 = c->priv_data;
@ -191,7 +191,7 @@ out:
} }
#if HAVE_LIBDC1394_1 #if HAVE_LIBDC1394_1
static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap) static int dc1394_v1_read_header(AVFormatContext *c)
{ {
dc1394_data* dc1394 = c->priv_data; dc1394_data* dc1394 = c->priv_data;
AVStream* vst; AVStream* vst;
@ -200,7 +200,7 @@ static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
struct dc1394_frame_format *fmt = NULL; struct dc1394_frame_format *fmt = NULL;
struct dc1394_frame_rate *fps = NULL; struct dc1394_frame_rate *fps = NULL;
if (dc1394_read_common(c,ap,&fmt,&fps) != 0) if (dc1394_read_common(c, &fmt, &fps) != 0)
return -1; return -1;
/* Now let us prep the hardware. */ /* Now let us prep the hardware. */
@ -285,7 +285,7 @@ static int dc1394_v1_close(AVFormatContext * context)
} }
#elif HAVE_LIBDC1394_2 #elif HAVE_LIBDC1394_2
static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap) static int dc1394_v2_read_header(AVFormatContext *c)
{ {
dc1394_data* dc1394 = c->priv_data; dc1394_data* dc1394 = c->priv_data;
dc1394camera_list_t *list; dc1394camera_list_t *list;
@ -293,7 +293,7 @@ static int dc1394_v2_read_header(AVFormatContext *c, AVFormatParameters * ap)
struct dc1394_frame_format *fmt = NULL; struct dc1394_frame_format *fmt = NULL;
struct dc1394_frame_rate *fps = NULL; struct dc1394_frame_rate *fps = NULL;
if (dc1394_read_common(c,ap,&fmt,&fps) != 0) if (dc1394_read_common(c, &fmt, &fps) != 0)
return -1; return -1;
/* Now let us prep the hardware. */ /* Now let us prep the hardware. */

2
libavdevice/oss_audio.c
Unescape View File

@ -204,7 +204,7 @@ static int audio_write_trailer(AVFormatContext *s1)
/* grab support */ /* grab support */
static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap) static int audio_read_header(AVFormatContext *s1)
{ {
AudioData *s = s1->priv_data; AudioData *s = s1->priv_data;
AVStream *st; AVStream *st;

3
libavdevice/pulse.c
Unescape View File

@ -66,8 +66,7 @@ static pa_sample_format_t codec_id_to_pulse_format(int codec_id) {
} }
} }
static av_cold int pulse_read_header(AVFormatContext *s, static av_cold int pulse_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
PulseData *pd = s->priv_data; PulseData *pd = s->priv_data;
AVStream *st; AVStream *st;

3
libavdevice/sndio_dec.c
Unescape View File

@ -28,8 +28,7 @@
#include "sndio_common.h" #include "sndio_common.h"
static av_cold int audio_read_header(AVFormatContext *s1, static av_cold int audio_read_header(AVFormatContext *s1)
AVFormatParameters *ap)
{ {
SndioData *s = s1->priv_data; SndioData *s = s1->priv_data;
AVStream *st; AVStream *st;

6
libavdevice/v4l2.c
Unescape View File

@ -543,7 +543,7 @@ static void mmap_close(struct video_data *s)
av_free(s->buf_len); av_free(s->buf_len);
} }
static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap) static int v4l2_set_parameters(AVFormatContext *s1)
{ {
struct video_data *s = s1->priv_data; struct video_data *s = s1->priv_data;
struct v4l2_input input = { 0 }; struct v4l2_input input = { 0 };
@ -678,7 +678,7 @@ static uint32_t device_try_init(AVFormatContext *s1,
return desired_format; return desired_format;
} }
static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) static int v4l2_read_header(AVFormatContext *s1)
{ {
struct video_data *s = s1->priv_data; struct video_data *s = s1->priv_data;
AVStream *st; AVStream *st;
@ -766,7 +766,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s->frame_format = desired_format; s->frame_format = desired_format;
if ((res = v4l2_set_parameters(s1, ap) < 0)) if ((res = v4l2_set_parameters(s1) < 0))
goto out; goto out;
st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);

2
libavdevice/vfwcap.c
Unescape View File

@ -238,7 +238,7 @@ static int vfw_read_close(AVFormatContext *s)
return 0; return 0;
} }
static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) static int vfw_read_header(AVFormatContext *s)
{ {
struct vfw_ctx *ctx = s->priv_data; struct vfw_ctx *ctx = s->priv_data;
AVCodecContext *codec; AVCodecContext *codec;

2
libavdevice/x11grab.c
Unescape View File

@ -154,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s)
* </ul> * </ul>
*/ */
static int static int
x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) x11grab_read_header(AVFormatContext *s1)
{ {
struct x11_grab *x11grab = s1->priv_data; struct x11_grab *x11grab = s1->priv_data;
Display *dpy; Display *dpy;

3
libavformat/4xm.c
Unescape View File

@ -91,8 +91,7 @@ static int fourxm_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int fourxm_read_header(AVFormatContext *s, static int fourxm_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
unsigned int fourcc_tag; unsigned int fourcc_tag;

3
libavformat/aacdec.c
Unescape View File

@ -61,8 +61,7 @@ static int adts_aac_probe(AVProbeData *p)
else return 0; else return 0;
} }
static int adts_aac_read_header(AVFormatContext *s, static int adts_aac_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVStream *st; AVStream *st;

2
libavformat/adxdec.c
Unescape View File

@ -62,7 +62,7 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }
static int adx_read_header(AVFormatContext *s, AVFormatParameters *ap) static int adx_read_header(AVFormatContext *s)
{ {
ADXDemuxerContext *c = s->priv_data; ADXDemuxerContext *c = s->priv_data;
AVCodecContext *avctx; AVCodecContext *avctx;

3
libavformat/aea.c
Unescape View File

@ -54,8 +54,7 @@ static int aea_read_probe(AVProbeData *p)
return 0; return 0;
} }
static int aea_read_header(AVFormatContext *s, static int aea_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
if (!st) if (!st)

3
libavformat/aiffdec.c
Unescape View File

@ -174,8 +174,7 @@ static int aiff_probe(AVProbeData *p)
} }
/* aiff input */ /* aiff input */
static int aiff_read_header(AVFormatContext *s, static int aiff_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
int size, filesize; int size, filesize;
int64_t offset = 0; int64_t offset = 0;

3
libavformat/amr.c
Unescape View File

@ -76,8 +76,7 @@ static int amr_probe(AVProbeData *p)
} }
/* amr input */ /* amr input */
static int amr_read_header(AVFormatContext *s, static int amr_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;

3
libavformat/anm.c
Unescape View File

@ -76,8 +76,7 @@ static int find_record(const AnmDemuxContext *anm, int record)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
static int read_header(AVFormatContext *s, static int read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AnmDemuxContext *anm = s->priv_data; AnmDemuxContext *anm = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/apc.c
Unescape View File

@ -30,7 +30,7 @@ static int apc_probe(AVProbeData *p)
return 0; return 0;
} }
static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap) static int apc_read_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;

2
libavformat/ape.c
Unescape View File

@ -152,7 +152,7 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
#endif #endif
} }
static int ape_read_header(AVFormatContext * s, AVFormatParameters * ap) static int ape_read_header(AVFormatContext * s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
APEContext *ape = s->priv_data; APEContext *ape = s->priv_data;

2
libavformat/applehttp.c
Unescape View File

@ -443,7 +443,7 @@ reload:
goto restart; goto restart;
} }
static int applehttp_read_header(AVFormatContext *s, AVFormatParameters *ap) static int applehttp_read_header(AVFormatContext *s)
{ {
AppleHTTPContext *c = s->priv_data; AppleHTTPContext *c = s->priv_data;
int ret = 0, i, j, stream_offset = 0; int ret = 0, i, j, stream_offset = 0;

2
libavformat/asfdec.c
Unescape View File

@ -580,7 +580,7 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
return 0; return 0;
} }
static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) static int asf_read_header(AVFormatContext *s)
{ {
ASFContext *asf = s->priv_data; ASFContext *asf = s->priv_data;
ff_asf_guid g; ff_asf_guid g;

2
libavformat/assdec.c
Unescape View File

@ -73,7 +73,7 @@ static int event_cmp(uint8_t **a, uint8_t **b)
return get_pts(*a) - get_pts(*b); return get_pts(*a) - get_pts(*b);
} }
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s)
{ {
int i, len, header_remaining; int i, len, header_remaining;
ASSContext *ass = s->priv_data; ASSContext *ass = s->priv_data;

3
libavformat/au.c
Unescape View File

@ -118,8 +118,7 @@ static int au_probe(AVProbeData *p)
} }
/* au input */ /* au input */
static int au_read_header(AVFormatContext *s, static int au_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
int size; int size;
unsigned int tag; unsigned int tag;

3
libavformat/avformat.h
Unescape View File

@ -491,8 +491,7 @@ typedef struct AVInputFormat {
* additional parameters. Only used in raw format right * additional parameters. Only used in raw format right
* now. 'av_new_stream' should be called to create new streams. * now. 'av_new_stream' should be called to create new streams.
*/ */
int (*read_header)(struct AVFormatContext *, int (*read_header)(struct AVFormatContext *);
AVFormatParameters *ap);
/** /**
* Read one packet and put it in 'pkt'. pts and flags are also * Read one packet and put it in 'pkt'. pts and flags are also

2
libavformat/avidec.c
Unescape View File

@ -325,7 +325,7 @@ static void avi_read_nikon(AVFormatContext *s, uint64_t end)
} }
} }
static int avi_read_header(AVFormatContext *s, AVFormatParameters *ap) static int avi_read_header(AVFormatContext *s)
{ {
AVIContext *avi = s->priv_data; AVIContext *avi = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/avisynth.c
Unescape View File

@ -41,7 +41,7 @@ typedef struct {
int next_stream; int next_stream;
} AVISynthContext; } AVISynthContext;
static int avisynth_read_header(AVFormatContext *s, AVFormatParameters *ap) static int avisynth_read_header(AVFormatContext *s)
{ {
AVISynthContext *avs = s->priv_data; AVISynthContext *avs = s->priv_data;
HRESULT res; HRESULT res;

2
libavformat/avs.c
Unescape View File

@ -55,7 +55,7 @@ static int avs_probe(AVProbeData * p)
return 0; return 0;
} }
static int avs_read_header(AVFormatContext * s, AVFormatParameters * ap) static int avs_read_header(AVFormatContext * s)
{ {
AvsFormat *avs = s->priv_data; AvsFormat *avs = s->priv_data;

3
libavformat/bethsoftvid.c
Unescape View File

@ -57,8 +57,7 @@ static int vid_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int vid_read_header(AVFormatContext *s, static int vid_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
BVID_DemuxContext *vid = s->priv_data; BVID_DemuxContext *vid = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/bfi.c
Unescape View File

@ -47,7 +47,7 @@ static int bfi_probe(AVProbeData * p)
return 0; return 0;
} }
static int bfi_read_header(AVFormatContext * s, AVFormatParameters * ap) static int bfi_read_header(AVFormatContext * s)
{ {
BFIContext *bfi = s->priv_data; BFIContext *bfi = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/bink.c
Unescape View File

@ -68,7 +68,7 @@ static int probe(AVProbeData *p)
return 0; return 0;
} }
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s)
{ {
BinkDemuxContext *bink = s->priv_data; BinkDemuxContext *bink = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/bmv.c
Unescape View File

@ -38,7 +38,7 @@ typedef struct BMVContext {
int64_t audio_pos; int64_t audio_pos;
} BMVContext; } BMVContext;
static int bmv_read_header(AVFormatContext *s, AVFormatParameters *ap) static int bmv_read_header(AVFormatContext *s)
{ {
AVStream *st, *ast; AVStream *st, *ast;
BMVContext *c = s->priv_data; BMVContext *c = s->priv_data;

3
libavformat/c93.c
Unescape View File

@ -57,8 +57,7 @@ static int probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int read_header(AVFormatContext *s, static int read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVStream *video; AVStream *video;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/cafdec.c
Unescape View File

@ -194,8 +194,7 @@ static void read_info_chunk(AVFormatContext *s, int64_t size)
} }
} }
static int read_header(AVFormatContext *s, static int read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
CaffContext *caf = s->priv_data; CaffContext *caf = s->priv_data;

2
libavformat/cdg.c
Unescape View File

@ -26,7 +26,7 @@
#define CDG_COMMAND 0x09 #define CDG_COMMAND 0x09
#define CDG_MASK 0x3F #define CDG_MASK 0x3F
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s)
{ {
AVStream *vst; AVStream *vst;
int ret; int ret;

2
libavformat/daud.c
Unescape View File

@ -20,7 +20,7 @@
*/ */
#include "avformat.h" #include "avformat.h"
static int daud_header(AVFormatContext *s, AVFormatParameters *ap) { static int daud_header(AVFormatContext *s) {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

3
libavformat/dfa.c
Unescape View File

@ -31,8 +31,7 @@ static int dfa_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int dfa_read_header(AVFormatContext *s, static int dfa_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;

2
libavformat/dsicin.c
Unescape View File

@ -91,7 +91,7 @@ static int cin_read_file_header(CinDemuxContext *cin, AVIOContext *pb) {
return 0; return 0;
} }
static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap) static int cin_read_header(AVFormatContext *s)
{ {
int rc; int rc;
CinDemuxContext *cin = s->priv_data; CinDemuxContext *cin = s->priv_data;

3
libavformat/dv.c
Unescape View File

@ -402,8 +402,7 @@ typedef struct RawDVContext {
uint8_t buf[DV_MAX_FRAME_SIZE]; uint8_t buf[DV_MAX_FRAME_SIZE];
} RawDVContext; } RawDVContext;
static int dv_read_header(AVFormatContext *s, static int dv_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
unsigned state, marker_pos = 0; unsigned state, marker_pos = 0;
RawDVContext *c = s->priv_data; RawDVContext *c = s->priv_data;

2
libavformat/dxa.c
Unescape View File

@ -51,7 +51,7 @@ static int dxa_probe(AVProbeData *p)
return 0; return 0;
} }
static int dxa_read_header(AVFormatContext *s, AVFormatParameters *ap) static int dxa_read_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
DXAContext *c = s->priv_data; DXAContext *c = s->priv_data;

2
libavformat/eacdata.c
Unescape View File

@ -45,7 +45,7 @@ static int cdata_probe(AVProbeData *p)
return 0; return 0;
} }
static int cdata_read_header(AVFormatContext *s, AVFormatParameters *ap) static int cdata_read_header(AVFormatContext *s)
{ {
CdataDemuxContext *cdata = s->priv_data; CdataDemuxContext *cdata = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/electronicarts.c
Unescape View File

@ -400,8 +400,7 @@ static int ea_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int ea_read_header(AVFormatContext *s, static int ea_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
EaDemuxContext *ea = s->priv_data; EaDemuxContext *ea = s->priv_data;
AVStream *st; AVStream *st;

2
libavformat/ffmdec.c
Unescape View File

@ -259,7 +259,7 @@ static int ffm_close(AVFormatContext *s)
} }
static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap) static int ffm_read_header(AVFormatContext *s)
{ {
FFMContext *ffm = s->priv_data; FFMContext *ffm = s->priv_data;
AVStream *st; AVStream *st;

2
libavformat/ffmetadec.c
Unescape View File

@ -123,7 +123,7 @@ static int read_tag(uint8_t *line, AVDictionary **m)
return 0; return 0;
} }
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s)
{ {
AVDictionary **m = &s->metadata; AVDictionary **m = &s->metadata;
uint8_t line[1024]; uint8_t line[1024];

3
libavformat/filmstripdec.c
Unescape View File

@ -34,8 +34,7 @@ typedef struct {
int leading; int leading;
} FilmstripDemuxContext; } FilmstripDemuxContext;
static int read_header(AVFormatContext *s, static int read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
FilmstripDemuxContext *film = s->priv_data; FilmstripDemuxContext *film = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/flacdec.c
Unescape View File

@ -27,8 +27,7 @@
#include "vorbiscomment.h" #include "vorbiscomment.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
static int flac_read_header(AVFormatContext *s, static int flac_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0; int ret, metadata_last=0, metadata_type, metadata_size, found_streaminfo=0;
uint8_t header[4]; uint8_t header[4];

3
libavformat/flic.c
Unescape View File

@ -83,8 +83,7 @@ static int flic_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int flic_read_header(AVFormatContext *s, static int flic_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
FlicDemuxContext *flic = s->priv_data; FlicDemuxContext *flic = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/flvdec.c
Unescape View File

@ -368,8 +368,7 @@ static AVStream *create_stream(AVFormatContext *s, int is_audio){
return st; return st;
} }
static int flv_read_header(AVFormatContext *s, static int flv_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
int offset, flags; int offset, flags;

2
libavformat/gsmdec.c
Unescape View File

@ -54,7 +54,7 @@ static int gsm_read_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }
static int gsm_read_header(AVFormatContext *s, AVFormatParameters *ap) static int gsm_read_header(AVFormatContext *s)
{ {
GSMDemuxerContext *c = s->priv_data; GSMDemuxerContext *c = s->priv_data;
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);

2
libavformat/gxf.c
Unescape View File

@ -259,7 +259,7 @@ static void gxf_read_index(AVFormatContext *s, int pkt_len) {
avio_skip(pb, pkt_len); avio_skip(pb, pkt_len);
} }
static int gxf_header(AVFormatContext *s, AVFormatParameters *ap) { static int gxf_header(AVFormatContext *s) {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
GXFPktType pkt_type; GXFPktType pkt_type;
int map_len; int map_len;

3
libavformat/idcin.c
Unescape View File

@ -138,8 +138,7 @@ static int idcin_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX / 2; return AVPROBE_SCORE_MAX / 2;
} }
static int idcin_read_header(AVFormatContext *s, static int idcin_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
IdcinDemuxContext *idcin = s->priv_data; IdcinDemuxContext *idcin = s->priv_data;

3
libavformat/idroqdec.c
Unescape View File

@ -66,8 +66,7 @@ static int roq_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int roq_read_header(AVFormatContext *s, static int roq_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
RoqDemuxContext *roq = s->priv_data; RoqDemuxContext *roq = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/iff.c
Unescape View File

@ -107,8 +107,7 @@ static int iff_probe(AVProbeData *p)
return 0; return 0;
} }
static int iff_read_header(AVFormatContext *s, static int iff_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
IffDemuxContext *iff = s->priv_data; IffDemuxContext *iff = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/img2.c
Unescape View File

@ -205,7 +205,7 @@ enum CodecID av_guess_image2_codec(const char *filename){
} }
#endif #endif
static int read_header(AVFormatContext *s1, AVFormatParameters *ap) static int read_header(AVFormatContext *s1)
{ {
VideoData *s = s1->priv_data; VideoData *s = s1->priv_data;
int first_index, last_index, ret = 0; int first_index, last_index, ret = 0;

3
libavformat/ipmovie.c
Unescape View File

@ -535,8 +535,7 @@ static int ipmovie_probe(AVProbeData *p)
return 0; return 0;
} }
static int ipmovie_read_header(AVFormatContext *s, static int ipmovie_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
IPMVEContext *ipmovie = s->priv_data; IPMVEContext *ipmovie = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/iss.c
Unescape View File

@ -65,7 +65,7 @@ static int iss_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static av_cold int iss_read_header(AVFormatContext *s, AVFormatParameters *ap) static av_cold int iss_read_header(AVFormatContext *s)
{ {
IssDemuxContext *iss = s->priv_data; IssDemuxContext *iss = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/iv8.c
Unescape View File

@ -37,7 +37,7 @@ static int probe(AVProbeData *p)
return 0; return 0;
} }
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s)
{ {
AVStream *st; AVStream *st;

2
libavformat/ivfdec.c
Unescape View File

@ -32,7 +32,7 @@ static int probe(AVProbeData *p)
return 0; return 0;
} }
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s)
{ {
AVStream *st; AVStream *st;
AVRational time_base; AVRational time_base;

3
libavformat/jvdec.c
Unescape View File

@ -58,8 +58,7 @@ static int read_probe(AVProbeData *pd)
return 0; return 0;
} }
static int read_header(AVFormatContext *s, static int read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
JVDemuxContext *jv = s->priv_data; JVDemuxContext *jv = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/libnut.c
Unescape View File

@ -186,7 +186,7 @@ static off_t av_seek(void * h, long long pos, int whence) {
return avio_seek(bc, pos, whence); return avio_seek(bc, pos, whence);
} }
static int nut_read_header(AVFormatContext * avf, AVFormatParameters * ap) { static int nut_read_header(AVFormatContext * avf) {
NUTContext * priv = avf->priv_data; NUTContext * priv = avf->priv_data;
AVIOContext * bc = avf->pb; AVIOContext * bc = avf->pb;
nut_demuxer_opts_tt dopts = { nut_demuxer_opts_tt dopts = {

2
libavformat/lmlm4.c
Unescape View File

@ -58,7 +58,7 @@ static int lmlm4_probe(AVProbeData * pd) {
return 0; return 0;
} }
static int lmlm4_read_header(AVFormatContext *s, AVFormatParameters *ap) { static int lmlm4_read_header(AVFormatContext *s) {
AVStream *st; AVStream *st;
if (!(st = avformat_new_stream(s, NULL))) if (!(st = avformat_new_stream(s, NULL)))

2
libavformat/lxfdec.c
Unescape View File

@ -196,7 +196,7 @@ static int get_packet_header(AVFormatContext *s, uint8_t *header, uint32_t *form
return ret; return ret;
} }
static int lxf_read_header(AVFormatContext *s, AVFormatParameters *ap) static int lxf_read_header(AVFormatContext *s)
{ {
LXFDemuxContext *lxf = s->priv_data; LXFDemuxContext *lxf = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/matroskadec.c
Unescape View File

@ -1269,7 +1269,7 @@ static int matroska_aac_sri(int samplerate)
return sri; return sri;
} }
static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap) static int matroska_read_header(AVFormatContext *s)
{ {
MatroskaDemuxContext *matroska = s->priv_data; MatroskaDemuxContext *matroska = s->priv_data;
EbmlList *attachements_list = &matroska->attachments; EbmlList *attachements_list = &matroska->attachments;

3
libavformat/mm.c
Unescape View File

@ -81,8 +81,7 @@ static int probe(AVProbeData *p)
return AVPROBE_SCORE_MAX / 2; return AVPROBE_SCORE_MAX / 2;
} }
static int read_header(AVFormatContext *s, static int read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
MmDemuxContext *mm = s->priv_data; MmDemuxContext *mm = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/mmf.c
Unescape View File

@ -180,8 +180,7 @@ static int mmf_probe(AVProbeData *p)
} }
/* mmf input */ /* mmf input */
static int mmf_read_header(AVFormatContext *s, static int mmf_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
MMFContext *mmf = s->priv_data; MMFContext *mmf = s->priv_data;
unsigned int tag; unsigned int tag;

2
libavformat/mov.c
Unescape View File

@ -2551,7 +2551,7 @@ finish:
avio_seek(sc->pb, cur_pos, SEEK_SET); avio_seek(sc->pb, cur_pos, SEEK_SET);
} }
static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap) static int mov_read_header(AVFormatContext *s)
{ {
MOVContext *mov = s->priv_data; MOVContext *mov = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/mp3dec.c
Unescape View File

@ -132,8 +132,7 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
return 0; return 0;
} }
static int mp3_read_header(AVFormatContext *s, static int mp3_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVStream *st; AVStream *st;
int64_t off; int64_t off;

2
libavformat/mpc.c
Unescape View File

@ -52,7 +52,7 @@ static int mpc_probe(AVProbeData *p)
return 0; return 0;
} }
static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap) static int mpc_read_header(AVFormatContext *s)
{ {
MPCContext *c = s->priv_data; MPCContext *c = s->priv_data;
AVStream *st; AVStream *st;

2
libavformat/mpc8.c
Unescape View File

@ -188,7 +188,7 @@ static void mpc8_handle_chunk(AVFormatContext *s, int tag, int64_t chunk_pos, in
} }
} }
static int mpc8_read_header(AVFormatContext *s, AVFormatParameters *ap) static int mpc8_read_header(AVFormatContext *s)
{ {
MPCContext *c = s->priv_data; MPCContext *c = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/mpeg.c
Unescape View File

@ -104,8 +104,7 @@ typedef struct MpegDemuxContext {
int sofdec; int sofdec;
} MpegDemuxContext; } MpegDemuxContext;
static int mpegps_read_header(AVFormatContext *s, static int mpegps_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
MpegDemuxContext *m = s->priv_data; MpegDemuxContext *m = s->priv_data;
const char *sofdec = "Sofdec"; const char *sofdec = "Sofdec";

3
libavformat/mpegts.c
Unescape View File

@ -1870,8 +1870,7 @@ static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
return 0; return 0;
} }
static int mpegts_read_header(AVFormatContext *s, static int mpegts_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
MpegTSContext *ts = s->priv_data; MpegTSContext *ts = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/msnwc_tcp.c
Unescape View File

@ -70,7 +70,7 @@ static int msnwc_tcp_probe(AVProbeData *p)
return -1; return -1;
} }
static int msnwc_tcp_read_header(AVFormatContext *ctx, AVFormatParameters *ap) static int msnwc_tcp_read_header(AVFormatContext *ctx)
{ {
AVIOContext *pb = ctx->pb; AVIOContext *pb = ctx->pb;
AVCodecContext *codec; AVCodecContext *codec;

2
libavformat/mtv.c
Unescape View File

@ -75,7 +75,7 @@ static int mtv_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap) static int mtv_read_header(AVFormatContext *s)
{ {
MTVDemuxContext *mtv = s->priv_data; MTVDemuxContext *mtv = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/mvi.c
Unescape View File

@ -36,7 +36,7 @@ typedef struct MviDemuxContext {
int video_frame_size; int video_frame_size;
} MviDemuxContext; } MviDemuxContext;
static int read_header(AVFormatContext *s, AVFormatParameters *ap) static int read_header(AVFormatContext *s)
{ {
MviDemuxContext *mvi = s->priv_data; MviDemuxContext *mvi = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

2
libavformat/mxfdec.c
Unescape View File

@ -1648,7 +1648,7 @@ static inline void compute_partition_essence_offset(AVFormatContext *s,
} }
} }
static int mxf_read_header(AVFormatContext *s, AVFormatParameters *ap) static int mxf_read_header(AVFormatContext *s)
{ {
MXFContext *mxf = s->priv_data; MXFContext *mxf = s->priv_data;
KLVPacket klv; KLVPacket klv;

2
libavformat/mxg.c
Unescape View File

@ -37,7 +37,7 @@ typedef struct MXGContext {
unsigned int cache_size; unsigned int cache_size;
} MXGContext; } MXGContext;
static int mxg_read_header(AVFormatContext *s, AVFormatParameters *ap) static int mxg_read_header(AVFormatContext *s)
{ {
AVStream *video_st, *audio_st; AVStream *video_st, *audio_st;
MXGContext *mxg = s->priv_data; MXGContext *mxg = s->priv_data;

2
libavformat/ncdec.c
Unescape View File

@ -44,7 +44,7 @@ static int nc_probe(AVProbeData *probe_packet)
return 0; return 0;
} }
static int nc_read_header(AVFormatContext *s, AVFormatParameters *ap) static int nc_read_header(AVFormatContext *s)
{ {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);

12
libavformat/nsvdec.c
Unescape View File

@ -269,7 +269,7 @@ static int nsv_resync(AVFormatContext *s)
return -1; return -1;
} }
static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap) static int nsv_parse_NSVf_header(AVFormatContext *s)
{ {
NSVContext *nsv = s->priv_data; NSVContext *nsv = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
@ -391,7 +391,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s, AVFormatParameters *ap)
return 0; return 0;
} }
static int nsv_parse_NSVs_header(AVFormatContext *s, AVFormatParameters *ap) static int nsv_parse_NSVs_header(AVFormatContext *s)
{ {
NSVContext *nsv = s->priv_data; NSVContext *nsv = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
@ -512,7 +512,7 @@ fail:
return -1; return -1;
} }
static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap) static int nsv_read_header(AVFormatContext *s)
{ {
NSVContext *nsv = s->priv_data; NSVContext *nsv = s->priv_data;
int i, err; int i, err;
@ -527,10 +527,10 @@ static int nsv_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (nsv_resync(s) < 0) if (nsv_resync(s) < 0)
return -1; return -1;
if (nsv->state == NSV_FOUND_NSVF) if (nsv->state == NSV_FOUND_NSVF)
err = nsv_parse_NSVf_header(s, ap); err = nsv_parse_NSVf_header(s);
/* we need the first NSVs also... */ /* we need the first NSVs also... */
if (nsv->state == NSV_FOUND_NSVS) { if (nsv->state == NSV_FOUND_NSVS) {
err = nsv_parse_NSVs_header(s, ap); err = nsv_parse_NSVs_header(s);
break; /* we just want the first one */ break; /* we just want the first one */
} }
} }
@ -571,7 +571,7 @@ null_chunk_retry:
if (err < 0) if (err < 0)
return err; return err;
if (nsv->state == NSV_FOUND_NSVS) if (nsv->state == NSV_FOUND_NSVS)
err = nsv_parse_NSVs_header(s, NULL); err = nsv_parse_NSVs_header(s);
if (err < 0) if (err < 0)
return err; return err;
if (nsv->state != NSV_HAS_READ_NSVS && nsv->state != NSV_FOUND_BEEF) if (nsv->state != NSV_HAS_READ_NSVS && nsv->state != NSV_FOUND_BEEF)

2
libavformat/nutdec.c
Unescape View File

@ -596,7 +596,7 @@ fail:
return ret; return ret;
} }
static int nut_read_header(AVFormatContext *s, AVFormatParameters *ap) static int nut_read_header(AVFormatContext *s)
{ {
NUTContext *nut = s->priv_data; NUTContext *nut = s->priv_data;
AVIOContext *bc = s->pb; AVIOContext *bc = s->pb;

2
libavformat/nuv.c
Unescape View File

@ -122,7 +122,7 @@ static int get_codec_data(AVIOContext *pb, AVStream *vst,
return 0; return 0;
} }
static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { static int nuv_header(AVFormatContext *s) {
NUVContext *ctx = s->priv_data; NUVContext *ctx = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
char id_string[12]; char id_string[12];

2
libavformat/oggdec.c
Unescape View File

@ -494,7 +494,7 @@ static int ogg_get_length(AVFormatContext *s)
return 0; return 0;
} }
static int ogg_read_header(AVFormatContext *s, AVFormatParameters *ap) static int ogg_read_header(AVFormatContext *s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int ret, i; int ret, i;

3
libavformat/omadec.c
Unescape View File

@ -256,8 +256,7 @@ static int decrypt_init(AVFormatContext *s, ID3v2ExtraMeta *em, uint8_t *header)
return 0; return 0;
} }
static int oma_read_header(AVFormatContext *s, static int oma_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
int ret, framesize, jsflag, samplerate; int ret, framesize, jsflag, samplerate;
uint32_t codec_params; uint32_t codec_params;

2
libavformat/pmpdec.c
Unescape View File

@ -39,7 +39,7 @@ static int pmp_probe(AVProbeData *p)
return 0; return 0;
} }
static int pmp_header(AVFormatContext *s, AVFormatParameters *ap) static int pmp_header(AVFormatContext *s)
{ {
PMPContext *pmp = s->priv_data; PMPContext *pmp = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/psxstr.c
Unescape View File

@ -96,8 +96,7 @@ static int str_probe(AVProbeData *p)
return 50; return 50;
} }
static int str_read_header(AVFormatContext *s, static int str_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
StrDemuxContext *str = s->priv_data; StrDemuxContext *str = s->priv_data;

2
libavformat/pva.c
Unescape View File

@ -41,7 +41,7 @@ static int pva_probe(AVProbeData * pd) {
return 0; return 0;
} }
static int pva_read_header(AVFormatContext *s, AVFormatParameters *ap) { static int pva_read_header(AVFormatContext *s) {
AVStream *st; AVStream *st;
if (!(st = avformat_new_stream(s, NULL))) if (!(st = avformat_new_stream(s, NULL)))

2
libavformat/qcp.c
Unescape View File

@ -80,7 +80,7 @@ static int qcp_probe(AVProbeData *pd)
return 0; return 0;
} }
static int qcp_read_header(AVFormatContext *s, AVFormatParameters *ap) static int qcp_read_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
QCPContext *c = s->priv_data; QCPContext *c = s->priv_data;

2
libavformat/r3d.c
Unescape View File

@ -159,7 +159,7 @@ static void r3d_read_reos(AVFormatContext *s)
avio_skip(s->pb, 6*4); avio_skip(s->pb, 6*4);
} }
static int r3d_read_header(AVFormatContext *s, AVFormatParameters *ap) static int r3d_read_header(AVFormatContext *s)
{ {
R3DContext *r3d = s->priv_data; R3DContext *r3d = s->priv_data;
Atom atom; Atom atom;

8
libavformat/rawdec.c
Unescape View File

@ -29,7 +29,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
/* raw input */ /* raw input */
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap) int ff_raw_read_header(AVFormatContext *s)
{ {
AVStream *st; AVStream *st;
enum CodecID id; enum CodecID id;
@ -120,8 +120,7 @@ int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }
int ff_raw_audio_read_header(AVFormatContext *s, int ff_raw_audio_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
if (!st) if (!st)
@ -136,8 +135,7 @@ int ff_raw_audio_read_header(AVFormatContext *s,
} }
/* MPEG-1/H.263 input */ /* MPEG-1/H.263 input */
int ff_raw_video_read_header(AVFormatContext *s, int ff_raw_video_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVStream *st; AVStream *st;
FFRawVideoDemuxerContext *s1 = s->priv_data; FFRawVideoDemuxerContext *s1 = s->priv_data;

6
libavformat/rawdec.h
Unescape View File

@ -41,13 +41,13 @@ typedef struct FFRawVideoDemuxerContext {
extern const AVOption ff_rawvideo_options[]; extern const AVOption ff_rawvideo_options[];
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap); int ff_raw_read_header(AVFormatContext *s);
int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt); int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt);
int ff_raw_audio_read_header(AVFormatContext *s, AVFormatParameters *ap); int ff_raw_audio_read_header(AVFormatContext *s);
int ff_raw_video_read_header(AVFormatContext *s, AVFormatParameters *ap); int ff_raw_video_read_header(AVFormatContext *s);
#define FF_RAWVIDEO_DEMUXER_CLASS(name)\ #define FF_RAWVIDEO_DEMUXER_CLASS(name)\
static const AVClass name ## _demuxer_class = {\ static const AVClass name ## _demuxer_class = {\

3
libavformat/rl2.c
Unescape View File

@ -72,8 +72,7 @@ static int rl2_probe(AVProbeData *p)
* @param ap format parameters * @param ap format parameters
* @return 0 on success, AVERROR otherwise * @return 0 on success, AVERROR otherwise
*/ */
static av_cold int rl2_read_header(AVFormatContext *s, static av_cold int rl2_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;

2
libavformat/rmdec.c
Unescape View File

@ -403,7 +403,7 @@ static int rm_read_header_old(AVFormatContext *s)
return rm_read_audio_stream_info(s, s->pb, st, st->priv_data, 1); return rm_read_audio_stream_info(s, s->pb, st, st->priv_data, 1);
} }
static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) static int rm_read_header(AVFormatContext *s)
{ {
RMDemuxContext *rm = s->priv_data; RMDemuxContext *rm = s->priv_data;
AVStream *st; AVStream *st;

2
libavformat/rpl.c
Unescape View File

@ -110,7 +110,7 @@ static AVRational read_fps(const char* line, int* error)
return result; return result;
} }
static int rpl_read_header(AVFormatContext *s, AVFormatParameters *ap) static int rpl_read_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
RPLContext *rpl = s->priv_data; RPLContext *rpl = s->priv_data;

2
libavformat/rsodec.c
Unescape View File

@ -27,7 +27,7 @@
#include "riff.h" #include "riff.h"
#include "rso.h" #include "rso.h"
static int rso_read_header(AVFormatContext *s, AVFormatParameters *ap) static int rso_read_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int id, rate, bps; int id, rate, bps;

7
libavformat/rtsp.c
Unescape View File

@ -1849,7 +1849,7 @@ static int sdp_probe(AVProbeData *p1)
return 0; return 0;
} }
static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap) static int sdp_read_header(AVFormatContext *s)
{ {
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
RTSPStream *rtsp_st; RTSPStream *rtsp_st;
@ -1935,8 +1935,7 @@ static int rtp_probe(AVProbeData *p)
return 0; return 0;
} }
static int rtp_read_header(AVFormatContext *s, static int rtp_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
uint8_t recvbuf[1500]; uint8_t recvbuf[1500];
char host[500], sdp[500]; char host[500], sdp[500];
@ -2013,7 +2012,7 @@ static int rtp_read_header(AVFormatContext *s,
rt->media_type_mask = (1 << (AVMEDIA_TYPE_DATA+1)) - 1; rt->media_type_mask = (1 << (AVMEDIA_TYPE_DATA+1)) - 1;
ret = sdp_read_header(s, ap); ret = sdp_read_header(s);
s->pb = NULL; s->pb = NULL;
return ret; return ret;

3
libavformat/rtspdec.c
Unescape View File

@ -150,8 +150,7 @@ static int rtsp_probe(AVProbeData *p)
return 0; return 0;
} }
static int rtsp_read_header(AVFormatContext *s, static int rtsp_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
RTSPState *rt = s->priv_data; RTSPState *rt = s->priv_data;
int ret; int ret;

3
libavformat/sapdec.c
Unescape View File

@ -60,8 +60,7 @@ static int sap_read_close(AVFormatContext *s)
return 0; return 0;
} }
static int sap_read_header(AVFormatContext *s, static int sap_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
struct SAPState *sap = s->priv_data; struct SAPState *sap = s->priv_data;
char host[1024], path[1024], url[1024]; char host[1024], path[1024], url[1024];

3
libavformat/segafilm.c
Unescape View File

@ -75,8 +75,7 @@ static int film_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
} }
static int film_read_header(AVFormatContext *s, static int film_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
FilmDemuxContext *film = s->priv_data; FilmDemuxContext *film = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

3
libavformat/sierravmd.c
Unescape View File

@ -78,8 +78,7 @@ static int vmd_probe(AVProbeData *p)
return AVPROBE_SCORE_MAX / 2; return AVPROBE_SCORE_MAX / 2;
} }
static int vmd_read_header(AVFormatContext *s, static int vmd_read_header(AVFormatContext *s)
AVFormatParameters *ap)
{ {
VmdDemuxContext *vmd = s->priv_data; VmdDemuxContext *vmd = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save