Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
d20576d0
Commit
d20576d0
authored
May 23, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: deprecate AVFormatParameters.channel.
parent
79405e57
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
dv1394.c
libavdevice/dv1394.c
+1
-1
libdc1394.c
libavdevice/libdc1394.c
+2
-0
v4l2.c
libavdevice/v4l2.c
+2
-0
avformat.h
libavformat/avformat.h
+1
-1
No files found.
libavdevice/dv1394.c
View file @
d20576d0
...
@@ -100,10 +100,10 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
...
@@ -100,10 +100,10 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
else
else
dv
->
format
=
DV1394_NTSC
;
dv
->
format
=
DV1394_NTSC
;
}
}
#endif
if
(
ap
->
channel
)
if
(
ap
->
channel
)
dv
->
channel
=
ap
->
channel
;
dv
->
channel
=
ap
->
channel
;
#endif
/* Open and initialize DV1394 device */
/* Open and initialize DV1394 device */
dv
->
fd
=
open
(
context
->
filename
,
O_RDONLY
);
dv
->
fd
=
open
(
context
->
filename
,
O_RDONLY
);
...
...
libavdevice/libdc1394.c
View file @
d20576d0
...
@@ -159,8 +159,10 @@ static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
...
@@ -159,8 +159,10 @@ static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
if
(
dc1394_read_common
(
c
,
ap
,
&
fmt
,
&
fps
)
!=
0
)
if
(
dc1394_read_common
(
c
,
ap
,
&
fmt
,
&
fps
)
!=
0
)
return
-
1
;
return
-
1
;
#if FF_API_FORMAT_PARAMETERS
if
(
ap
->
channel
)
if
(
ap
->
channel
)
dc1394
->
channel
=
ap
->
channel
;
dc1394
->
channel
=
ap
->
channel
;
#endif
/* Now let us prep the hardware. */
/* Now let us prep the hardware. */
dc1394
->
handle
=
dc1394_create_handle
(
0
);
/* FIXME: gotta have ap->port */
dc1394
->
handle
=
dc1394_create_handle
(
0
);
/* FIXME: gotta have ap->port */
...
...
libavdevice/v4l2.c
View file @
d20576d0
...
@@ -453,8 +453,10 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
...
@@ -453,8 +453,10 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
streamparm
.
type
=
V4L2_BUF_TYPE_VIDEO_CAPTURE
;
streamparm
.
type
=
V4L2_BUF_TYPE_VIDEO_CAPTURE
;
#if FF_API_FORMAT_PARAMETERS
if
(
ap
->
channel
>
0
)
if
(
ap
->
channel
>
0
)
s
->
channel
=
ap
->
channel
;
s
->
channel
=
ap
->
channel
;
#endif
/* set tv video input */
/* set tv video input */
memset
(
&
input
,
0
,
sizeof
(
input
));
memset
(
&
input
,
0
,
sizeof
(
input
));
...
...
libavformat/avformat.h
View file @
d20576d0
...
@@ -235,8 +235,8 @@ typedef struct AVFormatParameters {
...
@@ -235,8 +235,8 @@ typedef struct AVFormatParameters {
int
width
;
int
width
;
int
height
;
int
height
;
enum
PixelFormat
pix_fmt
;
enum
PixelFormat
pix_fmt
;
int
channel
;
/**< Used to select DV channel. */
#if FF_API_FORMAT_PARAMETERS
#if FF_API_FORMAT_PARAMETERS
attribute_deprecated
int
channel
;
/**< Used to select DV channel. */
attribute_deprecated
const
char
*
standard
;
/**< deprecated, use demuxer-specific options instead. */
attribute_deprecated
const
char
*
standard
;
/**< deprecated, use demuxer-specific options instead. */
attribute_deprecated
unsigned
int
mpeg2ts_raw
:
1
;
/**< deprecated, use mpegtsraw demuxer */
attribute_deprecated
unsigned
int
mpeg2ts_raw
:
1
;
/**< deprecated, use mpegtsraw demuxer */
/**< deprecated, use mpegtsraw demuxer-specific options instead */
/**< deprecated, use mpegtsraw demuxer-specific options instead */
...
...
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