xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-01-21 03:15:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lavf: deprecate AVFormatParameters.channel.

Browse Source
This commit is contained in:
Anton Khirnov 2011-05-23 22:06:09 +02:00
parent 79405e57dc
commit d20576d01b
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavdevice/dv1394.c
View File

@ -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);

2
libavdevice/libdc1394.c
View File

@ -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 */

2
libavdevice/v4l2.c
View File

@ -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));

2
libavformat/avformat.h
View File

@ -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 */