Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
external
ffmpeg
Commits
6e9651d1
Commit
6e9651d1
authored
Jan 12, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
parent
3b4aaa61
Changes
129
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
129 changed files
with
147 additions
and
202 deletions
+147
-202
alsa-audio-dec.c
libavdevice/alsa-audio-dec.c
+1
-2
bktr.c
libavdevice/bktr.c
+1
-1
dv1394.c
libavdevice/dv1394.c
+1
-1
fbdev.c
libavdevice/fbdev.c
+1
-2
jack_audio.c
libavdevice/jack_audio.c
+1
-1
libcdio.c
libavdevice/libcdio.c
+1
-1
libdc1394.c
libavdevice/libdc1394.c
+5
-5
oss_audio.c
libavdevice/oss_audio.c
+1
-1
pulse.c
libavdevice/pulse.c
+1
-2
sndio_dec.c
libavdevice/sndio_dec.c
+1
-2
v4l2.c
libavdevice/v4l2.c
+3
-3
vfwcap.c
libavdevice/vfwcap.c
+1
-1
x11grab.c
libavdevice/x11grab.c
+1
-1
4xm.c
libavformat/4xm.c
+1
-2
aacdec.c
libavformat/aacdec.c
+1
-2
adxdec.c
libavformat/adxdec.c
+1
-1
aea.c
libavformat/aea.c
+1
-2
aiffdec.c
libavformat/aiffdec.c
+1
-2
amr.c
libavformat/amr.c
+1
-2
anm.c
libavformat/anm.c
+1
-2
apc.c
libavformat/apc.c
+1
-1
ape.c
libavformat/ape.c
+1
-1
applehttp.c
libavformat/applehttp.c
+1
-1
asfdec.c
libavformat/asfdec.c
+1
-1
assdec.c
libavformat/assdec.c
+1
-1
au.c
libavformat/au.c
+1
-2
avformat.h
libavformat/avformat.h
+1
-2
avidec.c
libavformat/avidec.c
+1
-1
avisynth.c
libavformat/avisynth.c
+1
-1
avs.c
libavformat/avs.c
+1
-1
bethsoftvid.c
libavformat/bethsoftvid.c
+1
-2
bfi.c
libavformat/bfi.c
+1
-1
bink.c
libavformat/bink.c
+1
-1
bmv.c
libavformat/bmv.c
+1
-1
c93.c
libavformat/c93.c
+1
-2
cafdec.c
libavformat/cafdec.c
+1
-2
cdg.c
libavformat/cdg.c
+1
-1
daud.c
libavformat/daud.c
+1
-1
dfa.c
libavformat/dfa.c
+1
-2
dsicin.c
libavformat/dsicin.c
+1
-1
dv.c
libavformat/dv.c
+1
-2
dxa.c
libavformat/dxa.c
+1
-1
eacdata.c
libavformat/eacdata.c
+1
-1
electronicarts.c
libavformat/electronicarts.c
+1
-2
ffmdec.c
libavformat/ffmdec.c
+1
-1
ffmetadec.c
libavformat/ffmetadec.c
+1
-1
filmstripdec.c
libavformat/filmstripdec.c
+1
-2
flacdec.c
libavformat/flacdec.c
+1
-2
flic.c
libavformat/flic.c
+1
-2
flvdec.c
libavformat/flvdec.c
+1
-2
gsmdec.c
libavformat/gsmdec.c
+1
-1
gxf.c
libavformat/gxf.c
+1
-1
idcin.c
libavformat/idcin.c
+1
-2
idroqdec.c
libavformat/idroqdec.c
+1
-2
iff.c
libavformat/iff.c
+1
-2
img2.c
libavformat/img2.c
+1
-1
ipmovie.c
libavformat/ipmovie.c
+1
-2
iss.c
libavformat/iss.c
+1
-1
iv8.c
libavformat/iv8.c
+1
-1
ivfdec.c
libavformat/ivfdec.c
+1
-1
jvdec.c
libavformat/jvdec.c
+1
-2
libnut.c
libavformat/libnut.c
+1
-1
lmlm4.c
libavformat/lmlm4.c
+1
-1
lxfdec.c
libavformat/lxfdec.c
+1
-1
matroskadec.c
libavformat/matroskadec.c
+1
-1
mm.c
libavformat/mm.c
+1
-2
mmf.c
libavformat/mmf.c
+1
-2
mov.c
libavformat/mov.c
+1
-1
mp3dec.c
libavformat/mp3dec.c
+1
-2
mpc.c
libavformat/mpc.c
+1
-1
mpc8.c
libavformat/mpc8.c
+1
-1
mpeg.c
libavformat/mpeg.c
+1
-2
mpegts.c
libavformat/mpegts.c
+1
-2
msnwc_tcp.c
libavformat/msnwc_tcp.c
+1
-1
mtv.c
libavformat/mtv.c
+1
-1
mvi.c
libavformat/mvi.c
+1
-1
mxfdec.c
libavformat/mxfdec.c
+1
-1
mxg.c
libavformat/mxg.c
+1
-1
ncdec.c
libavformat/ncdec.c
+1
-1
nsvdec.c
libavformat/nsvdec.c
+6
-6
nutdec.c
libavformat/nutdec.c
+1
-1
nuv.c
libavformat/nuv.c
+1
-1
oggdec.c
libavformat/oggdec.c
+1
-1
omadec.c
libavformat/omadec.c
+1
-2
pmpdec.c
libavformat/pmpdec.c
+1
-1
psxstr.c
libavformat/psxstr.c
+1
-2
pva.c
libavformat/pva.c
+1
-1
qcp.c
libavformat/qcp.c
+1
-1
r3d.c
libavformat/r3d.c
+1
-1
rawdec.c
libavformat/rawdec.c
+3
-5
rawdec.h
libavformat/rawdec.h
+3
-3
rl2.c
libavformat/rl2.c
+1
-2
rmdec.c
libavformat/rmdec.c
+1
-1
rpl.c
libavformat/rpl.c
+1
-1
rsodec.c
libavformat/rsodec.c
+1
-1
rtsp.c
libavformat/rtsp.c
+3
-4
rtspdec.c
libavformat/rtspdec.c
+1
-2
sapdec.c
libavformat/sapdec.c
+1
-2
segafilm.c
libavformat/segafilm.c
+1
-2
sierravmd.c
libavformat/sierravmd.c
+1
-2
siff.c
libavformat/siff.c
+1
-1
smacker.c
libavformat/smacker.c
+1
-1
smjpegdec.c
libavformat/smjpegdec.c
+1
-1
sol.c
libavformat/sol.c
+1
-2
soxdec.c
libavformat/soxdec.c
+1
-2
spdifdec.c
libavformat/spdifdec.c
+1
-1
srtdec.c
libavformat/srtdec.c
+1
-1
swfdec.c
libavformat/swfdec.c
+1
-1
thp.c
libavformat/thp.c
+1
-2
tiertexseq.c
libavformat/tiertexseq.c
+1
-1
tmv.c
libavformat/tmv.c
+1
-1
tta.c
libavformat/tta.c
+1
-1
tty.c
libavformat/tty.c
+1
-2
txd.c
libavformat/txd.c
+1
-1
utils.c
libavformat/utils.c
+1
-2
vc1test.c
libavformat/vc1test.c
+1
-2
vocdec.c
libavformat/vocdec.c
+1
-1
vqf.c
libavformat/vqf.c
+1
-1
wav.c
libavformat/wav.c
+2
-3
wc3movie.c
libavformat/wc3movie.c
+1
-2
westwood_aud.c
libavformat/westwood_aud.c
+1
-2
westwood_vqa.c
libavformat/westwood_vqa.c
+1
-2
wtv.c
libavformat/wtv.c
+1
-1
wv.c
libavformat/wv.c
+1
-2
xa.c
libavformat/xa.c
+1
-2
xmv.c
libavformat/xmv.c
+1
-2
xwma.c
libavformat/xwma.c
+1
-1
yop.c
libavformat/yop.c
+1
-1
yuv4mpeg.c
libavformat/yuv4mpeg.c
+1
-1
No files found.
libavdevice/alsa-audio-dec.c
View file @
6e9651d1
...
...
@@ -52,8 +52,7 @@
#include "alsa-audio.h"
static
av_cold
int
audio_read_header
(
AVFormatContext
*
s1
,
AVFormatParameters
*
ap
)
static
av_cold
int
audio_read_header
(
AVFormatContext
*
s1
)
{
AlsaData
*
s
=
s1
->
priv_data
;
AVStream
*
st
;
...
...
libavdevice/bktr.c
View file @
6e9651d1
...
...
@@ -243,7 +243,7 @@ static int grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
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
;
AVStream
*
st
;
...
...
libavdevice/dv1394.c
View file @
6e9651d1
...
...
@@ -81,7 +81,7 @@ static int dv1394_start(struct dv1394_data *dv)
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
;
...
...
libavdevice/fbdev.c
View file @
6e9651d1
...
...
@@ -95,8 +95,7 @@ typedef struct {
uint8_t
*
data
;
///< framebuffer data
}
FBDevContext
;
av_cold
static
int
fbdev_read_header
(
AVFormatContext
*
avctx
,
AVFormatParameters
*
ap
)
av_cold
static
int
fbdev_read_header
(
AVFormatContext
*
avctx
)
{
FBDevContext
*
fbdev
=
avctx
->
priv_data
;
AVStream
*
st
=
NULL
;
...
...
libavdevice/jack_audio.c
View file @
6e9651d1
...
...
@@ -221,7 +221,7 @@ static void stop_jack(JackData *self)
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
;
AVStream
*
stream
;
...
...
libavdevice/libcdio.c
View file @
6e9651d1
...
...
@@ -46,7 +46,7 @@ typedef struct CDIOContext {
int
paranoia_mode
;
}
CDIOContext
;
static
av_cold
int
read_header
(
AVFormatContext
*
ctx
,
AVFormatParameters
*
ap
)
static
av_cold
int
read_header
(
AVFormatContext
*
ctx
)
{
CDIOContext
*
s
=
ctx
->
priv_data
;
AVStream
*
st
;
...
...
libavdevice/libdc1394.c
View file @
6e9651d1
...
...
@@ -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
)
{
dc1394_data
*
dc1394
=
c
->
priv_data
;
...
...
@@ -191,7 +191,7 @@ out:
}
#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
;
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_rate
*
fps
=
NULL
;
if
(
dc1394_read_common
(
c
,
ap
,
&
fmt
,
&
fps
)
!=
0
)
if
(
dc1394_read_common
(
c
,
&
fmt
,
&
fps
)
!=
0
)
return
-
1
;
/* Now let us prep the hardware. */
...
...
@@ -285,7 +285,7 @@ static int dc1394_v1_close(AVFormatContext * context)
}
#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
;
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_rate
*
fps
=
NULL
;
if
(
dc1394_read_common
(
c
,
ap
,
&
fmt
,
&
fps
)
!=
0
)
if
(
dc1394_read_common
(
c
,
&
fmt
,
&
fps
)
!=
0
)
return
-
1
;
/* Now let us prep the hardware. */
...
...
libavdevice/oss_audio.c
View file @
6e9651d1
...
...
@@ -204,7 +204,7 @@ static int audio_write_trailer(AVFormatContext *s1)
/* grab support */
static
int
audio_read_header
(
AVFormatContext
*
s1
,
AVFormatParameters
*
ap
)
static
int
audio_read_header
(
AVFormatContext
*
s1
)
{
AudioData
*
s
=
s1
->
priv_data
;
AVStream
*
st
;
...
...
libavdevice/pulse.c
View file @
6e9651d1
...
...
@@ -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
,
AVFormatParameters
*
ap
)
static
av_cold
int
pulse_read_header
(
AVFormatContext
*
s
)
{
PulseData
*
pd
=
s
->
priv_data
;
AVStream
*
st
;
...
...
libavdevice/sndio_dec.c
View file @
6e9651d1
...
...
@@ -28,8 +28,7 @@
#include "sndio_common.h"
static
av_cold
int
audio_read_header
(
AVFormatContext
*
s1
,
AVFormatParameters
*
ap
)
static
av_cold
int
audio_read_header
(
AVFormatContext
*
s1
)
{
SndioData
*
s
=
s1
->
priv_data
;
AVStream
*
st
;
...
...
libavdevice/v4l2.c
View file @
6e9651d1
...
...
@@ -543,7 +543,7 @@ static void mmap_close(struct video_data *s)
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
v4l2_input
input
=
{
0
};
...
...
@@ -678,7 +678,7 @@ static uint32_t device_try_init(AVFormatContext *s1,
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
;
AVStream
*
st
;
...
...
@@ -766,7 +766,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
s
->
frame_format
=
desired_format
;
if
((
res
=
v4l2_set_parameters
(
s1
,
ap
)
<
0
))
if
((
res
=
v4l2_set_parameters
(
s1
)
<
0
))
goto
out
;
st
->
codec
->
pix_fmt
=
fmt_v4l2ff
(
desired_format
,
codec_id
);
...
...
libavdevice/vfwcap.c
View file @
6e9651d1
...
...
@@ -238,7 +238,7 @@ static int vfw_read_close(AVFormatContext *s)
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
;
AVCodecContext
*
codec
;
...
...
libavdevice/x11grab.c
View file @
6e9651d1
...
...
@@ -154,7 +154,7 @@ x11grab_region_win_init(struct x11_grab *s)
* </ul>
*/
static
int
x11grab_read_header
(
AVFormatContext
*
s1
,
AVFormatParameters
*
ap
)
x11grab_read_header
(
AVFormatContext
*
s1
)
{
struct
x11_grab
*
x11grab
=
s1
->
priv_data
;
Display
*
dpy
;
...
...
libavformat/4xm.c
View file @
6e9651d1
...
...
@@ -91,8 +91,7 @@ static int fourxm_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
}
static
int
fourxm_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
fourxm_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
unsigned
int
fourcc_tag
;
...
...
libavformat/aacdec.c
View file @
6e9651d1
...
...
@@ -61,8 +61,7 @@ static int adts_aac_probe(AVProbeData *p)
else
return
0
;
}
static
int
adts_aac_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
adts_aac_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
;
...
...
libavformat/adxdec.c
View file @
6e9651d1
...
...
@@ -62,7 +62,7 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt)
return
0
;
}
static
int
adx_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
adx_read_header
(
AVFormatContext
*
s
)
{
ADXDemuxerContext
*
c
=
s
->
priv_data
;
AVCodecContext
*
avctx
;
...
...
libavformat/aea.c
View file @
6e9651d1
...
...
@@ -54,8 +54,7 @@ static int aea_read_probe(AVProbeData *p)
return
0
;
}
static
int
aea_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
aea_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
...
...
libavformat/aiffdec.c
View file @
6e9651d1
...
...
@@ -174,8 +174,7 @@ static int aiff_probe(AVProbeData *p)
}
/* aiff input */
static
int
aiff_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
aiff_read_header
(
AVFormatContext
*
s
)
{
int
size
,
filesize
;
int64_t
offset
=
0
;
...
...
libavformat/amr.c
View file @
6e9651d1
...
...
@@ -76,8 +76,7 @@ static int amr_probe(AVProbeData *p)
}
/* amr input */
static
int
amr_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
amr_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
AVStream
*
st
;
...
...
libavformat/anm.c
View file @
6e9651d1
...
...
@@ -76,8 +76,7 @@ static int find_record(const AnmDemuxContext *anm, int record)
return
AVERROR_INVALIDDATA
;
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
AnmDemuxContext
*
anm
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/apc.c
View file @
6e9651d1
...
...
@@ -30,7 +30,7 @@ static int apc_probe(AVProbeData *p)
return
0
;
}
static
int
apc_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
apc_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
AVStream
*
st
;
...
...
libavformat/ape.c
View file @
6e9651d1
...
...
@@ -152,7 +152,7 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
#endif
}
static
int
ape_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
ape_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
APEContext
*
ape
=
s
->
priv_data
;
...
...
libavformat/applehttp.c
View file @
6e9651d1
...
...
@@ -443,7 +443,7 @@ reload:
goto
restart
;
}
static
int
applehttp_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
applehttp_read_header
(
AVFormatContext
*
s
)
{
AppleHTTPContext
*
c
=
s
->
priv_data
;
int
ret
=
0
,
i
,
j
,
stream_offset
=
0
;
...
...
libavformat/asfdec.c
View file @
6e9651d1
...
...
@@ -580,7 +580,7 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
return
0
;
}
static
int
asf_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
asf_read_header
(
AVFormatContext
*
s
)
{
ASFContext
*
asf
=
s
->
priv_data
;
ff_asf_guid
g
;
...
...
libavformat/assdec.c
View file @
6e9651d1
...
...
@@ -73,7 +73,7 @@ static int event_cmp(uint8_t **a, uint8_t **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
;
ASSContext
*
ass
=
s
->
priv_data
;
...
...
libavformat/au.c
View file @
6e9651d1
...
...
@@ -118,8 +118,7 @@ static int au_probe(AVProbeData *p)
}
/* au input */
static
int
au_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
au_read_header
(
AVFormatContext
*
s
)
{
int
size
;
unsigned
int
tag
;
...
...
libavformat/avformat.h
View file @
6e9651d1
...
...
@@ -491,8 +491,7 @@ typedef struct AVInputFormat {
* additional parameters. Only used in raw format right
* now. 'av_new_stream' should be called to create new streams.
*/
int
(
*
read_header
)(
struct
AVFormatContext
*
,
AVFormatParameters
*
ap
);
int
(
*
read_header
)(
struct
AVFormatContext
*
);
/**
* Read one packet and put it in 'pkt'. pts and flags are also
...
...
libavformat/avidec.c
View file @
6e9651d1
...
...
@@ -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
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/avisynth.c
View file @
6e9651d1
...
...
@@ -41,7 +41,7 @@ typedef struct {
int
next_stream
;
}
AVISynthContext
;
static
int
avisynth_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
avisynth_read_header
(
AVFormatContext
*
s
)
{
AVISynthContext
*
avs
=
s
->
priv_data
;
HRESULT
res
;
...
...
libavformat/avs.c
View file @
6e9651d1
...
...
@@ -55,7 +55,7 @@ static int avs_probe(AVProbeData * p)
return
0
;
}
static
int
avs_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
avs_read_header
(
AVFormatContext
*
s
)
{
AvsFormat
*
avs
=
s
->
priv_data
;
...
...
libavformat/bethsoftvid.c
View file @
6e9651d1
...
...
@@ -57,8 +57,7 @@ static int vid_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
}
static
int
vid_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
vid_read_header
(
AVFormatContext
*
s
)
{
BVID_DemuxContext
*
vid
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/bfi.c
View file @
6e9651d1
...
...
@@ -47,7 +47,7 @@ static int bfi_probe(AVProbeData * p)
return
0
;
}
static
int
bfi_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
bfi_read_header
(
AVFormatContext
*
s
)
{
BFIContext
*
bfi
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/bink.c
View file @
6e9651d1
...
...
@@ -68,7 +68,7 @@ static int probe(AVProbeData *p)
return
0
;
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
BinkDemuxContext
*
bink
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/bmv.c
View file @
6e9651d1
...
...
@@ -38,7 +38,7 @@ typedef struct BMVContext {
int64_t
audio_pos
;
}
BMVContext
;
static
int
bmv_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
bmv_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
,
*
ast
;
BMVContext
*
c
=
s
->
priv_data
;
...
...
libavformat/c93.c
View file @
6e9651d1
...
...
@@ -57,8 +57,7 @@ static int probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
AVStream
*
video
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/cafdec.c
View file @
6e9651d1
...
...
@@ -194,8 +194,7 @@ static void read_info_chunk(AVFormatContext *s, int64_t size)
}
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
CaffContext
*
caf
=
s
->
priv_data
;
...
...
libavformat/cdg.c
View file @
6e9651d1
...
...
@@ -26,7 +26,7 @@
#define CDG_COMMAND 0x09
#define CDG_MASK 0x3F
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
AVStream
*
vst
;
int
ret
;
...
...
libavformat/daud.c
View file @
6e9651d1
...
...
@@ -20,7 +20,7 @@
*/
#include "avformat.h"
static
int
daud_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
{
static
int
daud_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
...
...
libavformat/dfa.c
View file @
6e9651d1
...
...
@@ -31,8 +31,7 @@ static int dfa_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
}
static
int
dfa_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
dfa_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
AVStream
*
st
;
...
...
libavformat/dsicin.c
View file @
6e9651d1
...
...
@@ -91,7 +91,7 @@ static int cin_read_file_header(CinDemuxContext *cin, AVIOContext *pb) {
return
0
;
}
static
int
cin_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
cin_read_header
(
AVFormatContext
*
s
)
{
int
rc
;
CinDemuxContext
*
cin
=
s
->
priv_data
;
...
...
libavformat/dv.c
View file @
6e9651d1
...
...
@@ -402,8 +402,7 @@ typedef struct RawDVContext {
uint8_t
buf
[
DV_MAX_FRAME_SIZE
];
}
RawDVContext
;
static
int
dv_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
dv_read_header
(
AVFormatContext
*
s
)
{
unsigned
state
,
marker_pos
=
0
;
RawDVContext
*
c
=
s
->
priv_data
;
...
...
libavformat/dxa.c
View file @
6e9651d1
...
...
@@ -51,7 +51,7 @@ static int dxa_probe(AVProbeData *p)
return
0
;
}
static
int
dxa_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
dxa_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
DXAContext
*
c
=
s
->
priv_data
;
...
...
libavformat/eacdata.c
View file @
6e9651d1
...
...
@@ -45,7 +45,7 @@ static int cdata_probe(AVProbeData *p)
return
0
;
}
static
int
cdata_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
cdata_read_header
(
AVFormatContext
*
s
)
{
CdataDemuxContext
*
cdata
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/electronicarts.c
View file @
6e9651d1
...
...
@@ -400,8 +400,7 @@ static int ea_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
}
static
int
ea_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
ea_read_header
(
AVFormatContext
*
s
)
{
EaDemuxContext
*
ea
=
s
->
priv_data
;
AVStream
*
st
;
...
...
libavformat/ffmdec.c
View file @
6e9651d1
...
...
@@ -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
;
AVStream
*
st
;
...
...
libavformat/ffmetadec.c
View file @
6e9651d1
...
...
@@ -123,7 +123,7 @@ static int read_tag(uint8_t *line, AVDictionary **m)
return
0
;
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
AVDictionary
**
m
=
&
s
->
metadata
;
uint8_t
line
[
1024
];
...
...
libavformat/filmstripdec.c
View file @
6e9651d1
...
...
@@ -34,8 +34,7 @@ typedef struct {
int
leading
;
}
FilmstripDemuxContext
;
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
FilmstripDemuxContext
*
film
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/flacdec.c
View file @
6e9651d1
...
...
@@ -27,8 +27,7 @@
#include "vorbiscomment.h"
#include "libavcodec/bytestream.h"
static
int
flac_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
flac_read_header
(
AVFormatContext
*
s
)
{
int
ret
,
metadata_last
=
0
,
metadata_type
,
metadata_size
,
found_streaminfo
=
0
;
uint8_t
header
[
4
];
...
...
libavformat/flic.c
View file @
6e9651d1
...
...
@@ -83,8 +83,7 @@ static int flic_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
}
static
int
flic_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
flic_read_header
(
AVFormatContext
*
s
)
{
FlicDemuxContext
*
flic
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/flvdec.c
View file @
6e9651d1
...
...
@@ -368,8 +368,7 @@ static AVStream *create_stream(AVFormatContext *s, int is_audio){
return
st
;
}
static
int
flv_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
flv_read_header
(
AVFormatContext
*
s
)
{
int
offset
,
flags
;
...
...
libavformat/gsmdec.c
View file @
6e9651d1
...
...
@@ -54,7 +54,7 @@ static int gsm_read_packet(AVFormatContext *s, AVPacket *pkt)
return
0
;
}
static
int
gsm_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
gsm_read_header
(
AVFormatContext
*
s
)
{
GSMDemuxerContext
*
c
=
s
->
priv_data
;
AVStream
*
st
=
avformat_new_stream
(
s
,
NULL
);
...
...
libavformat/gxf.c
View file @
6e9651d1
...
...
@@ -259,7 +259,7 @@ static void gxf_read_index(AVFormatContext *s, int 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
;
GXFPktType
pkt_type
;
int
map_len
;
...
...
libavformat/idcin.c
View file @
6e9651d1
...
...
@@ -138,8 +138,7 @@ static int idcin_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
/
2
;
}
static
int
idcin_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
idcin_read_header
(
AVFormatContext
*
s
)
{
AVIOContext
*
pb
=
s
->
pb
;
IdcinDemuxContext
*
idcin
=
s
->
priv_data
;
...
...
libavformat/idroqdec.c
View file @
6e9651d1
...
...
@@ -66,8 +66,7 @@ static int roq_probe(AVProbeData *p)
return
AVPROBE_SCORE_MAX
;
}
static
int
roq_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
roq_read_header
(
AVFormatContext
*
s
)
{
RoqDemuxContext
*
roq
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/iff.c
View file @
6e9651d1
...
...
@@ -107,8 +107,7 @@ static int iff_probe(AVProbeData *p)
return
0
;
}
static
int
iff_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
iff_read_header
(
AVFormatContext
*
s
)
{
IffDemuxContext
*
iff
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/img2.c
View file @
6e9651d1
...
...
@@ -205,7 +205,7 @@ enum CodecID av_guess_image2_codec(const char *filename){
}
#endif
static
int
read_header
(
AVFormatContext
*
s1
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s1
)
{
VideoData
*
s
=
s1
->
priv_data
;
int
first_index
,
last_index
,
ret
=
0
;
...
...
libavformat/ipmovie.c
View file @
6e9651d1
...
...
@@ -535,8 +535,7 @@ static int ipmovie_probe(AVProbeData *p)
return
0
;
}
static
int
ipmovie_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
ipmovie_read_header
(
AVFormatContext
*
s
)
{
IPMVEContext
*
ipmovie
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/iss.c
View file @
6e9651d1
...
...
@@ -65,7 +65,7 @@ static int iss_probe(AVProbeData *p)
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
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/iv8.c
View file @
6e9651d1
...
...
@@ -37,7 +37,7 @@ static int probe(AVProbeData *p)
return
0
;
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
;
...
...
libavformat/ivfdec.c
View file @
6e9651d1
...
...
@@ -32,7 +32,7 @@ static int probe(AVProbeData *p)
return
0
;
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
;
AVRational
time_base
;
...
...
libavformat/jvdec.c
View file @
6e9651d1
...
...
@@ -58,8 +58,7 @@ static int read_probe(AVProbeData *pd)
return
0
;
}
static
int
read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
static
int
read_header
(
AVFormatContext
*
s
)
{
JVDemuxContext
*
jv
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
...
...
libavformat/libnut.c
View file @
6e9651d1
...
...
@@ -186,7 +186,7 @@ static off_t av_seek(void * h, long long pos, int 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
;
AVIOContext
*
bc
=
avf
->
pb
;
nut_demuxer_opts_tt
dopts
=
{
...
...
libavformat/lmlm4.c
View file @
6e9651d1
...
...
@@ -58,7 +58,7 @@ static int lmlm4_probe(AVProbeData * pd) {