Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
fc68a8f7
Commit
fc68a8f7
authored
May 23, 2011
by
Anton Khirnov
Browse files
lavf: deprecate AVFormatParameters.standard.
parent
b3da2692
Changes
5
Hide whitespace changes
Inline
Side-by-side
libavdevice/bktr.c
View file @
fc68a8f7
...
...
@@ -277,6 +277,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
st
->
codec
->
time_base
.
den
=
frame_rate
;
st
->
codec
->
time_base
.
num
=
frame_rate_base
;
#if FF_API_FORMAT_PARAMETERS
if
(
ap
->
standard
)
{
if
(
!
strcasecmp
(
ap
->
standard
,
"pal"
))
s
->
standard
=
PAL
;
...
...
@@ -285,6 +286,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
else
if
(
!
strcasecmp
(
ap
->
standard
,
"ntsc"
))
s
->
standard
=
NTSC
;
}
#endif
if
(
bktr_init
(
s1
->
filename
,
width
,
height
,
s
->
standard
,
&
(
s
->
video_fd
),
&
(
s
->
tuner_fd
),
-
1
,
0
.
0
)
<
0
)
...
...
libavdevice/dv1394.c
View file @
fc68a8f7
...
...
@@ -93,12 +93,14 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
if
(
!
dv
->
dv_demux
)
goto
failed
;
#if FF_API_FORMAT_PARAMETERS
if
(
ap
->
standard
)
{
if
(
!
strcasecmp
(
ap
->
standard
,
"pal"
))
dv
->
format
=
DV1394_PAL
;
else
dv
->
format
=
DV1394_NTSC
;
}
#endif
if
(
ap
->
channel
)
dv
->
channel
=
ap
->
channel
;
...
...
libavdevice/v4l.c
View file @
fc68a8f7
...
...
@@ -136,6 +136,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
/* set tv standard */
if
(
!
ioctl
(
video_fd
,
VIDIOCGTUNER
,
&
tuner
))
{
#if FF_API_FORMAT_PARAMETERS
if
(
ap
->
standard
)
{
if
(
!
strcasecmp
(
ap
->
standard
,
"pal"
))
s
->
standard
=
VIDEO_MODE_PAL
;
...
...
@@ -144,6 +145,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
else
s
->
standard
=
VIDEO_MODE_NTSC
;
}
#endif
tuner
.
mode
=
s
->
standard
;
ioctl
(
video_fd
,
VIDIOCSTUNER
,
&
tuner
);
}
...
...
libavdevice/v4l2.c
View file @
fc68a8f7
...
...
@@ -470,10 +470,12 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
}
}
#if FF_API_FORMAT_PARAMETERS
if
(
ap
->
standard
)
{
av_freep
(
&
s
->
standard
);
s
->
standard
=
av_strdup
(
ap
->
standard
);
}
#endif
if
(
s
->
standard
)
{
av_log
(
s1
,
AV_LOG_DEBUG
,
"The V4L2 driver set standard: %s
\n
"
,
...
...
libavformat/avformat.h
View file @
fc68a8f7
...
...
@@ -236,8 +236,8 @@ typedef struct AVFormatParameters {
int
height
;
enum
PixelFormat
pix_fmt
;
int
channel
;
/**< Used to select DV channel. */
const
char
*
standard
;
/**< TV standard, NTSC, PAL, SECAM */
#if FF_API_FORMAT_PARAMETERS
attribute_deprecated
const
char
*
standard
;
/**< deprecated, use demuxer-specific options instead. */
attribute_deprecated
unsigned
int
mpeg2ts_raw
:
1
;
/**< deprecated, use mpegtsraw demuxer */
/**< deprecated, use mpegtsraw demuxer-specific options instead */
attribute_deprecated
unsigned
int
mpeg2ts_compute_pcr
:
1
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment