From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 23 May 2011 20:06:09 +0000 (+0200)
Subject: lavf: deprecate AVFormatParameters.channel.
X-Git-Tag: android-x86-4.4-r1~12310^2~1160
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d20576d01b6489e37813302c208df01068418bfb;p=android-x86%2Fexternal-ffmpeg.git

lavf: deprecate AVFormatParameters.channel.
---

diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 0981eff53c..c9b7a69d6f 100644
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -100,10 +100,10 @@ static int dv1394_read_header(AVFormatContext * context, AVFormatParameters * ap
        else
            dv->format = DV1394_NTSC;
     }
-#endif
 
     if (ap->channel)
         dv->channel = ap->channel;
+#endif
 
     /* Open and initialize DV1394 device */
     dv->fd = open(context->filename, O_RDONLY);
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c
index a8406b8c2e..96e9e9b88b 100644
--- a/libavdevice/libdc1394.c
+++ b/libavdevice/libdc1394.c
@@ -159,8 +159,10 @@ static int dc1394_v1_read_header(AVFormatContext *c, AVFormatParameters * ap)
     if (dc1394_read_common(c,ap,&fmt,&fps) != 0)
         return -1;
 
+#if FF_API_FORMAT_PARAMETERS
     if (ap->channel)
         dc1394->channel = ap->channel;
+#endif
 
     /* Now let us prep the hardware. */
     dc1394->handle = dc1394_create_handle(0); /* FIXME: gotta have ap->port */
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c
index 0385a2c6c0..566ee92801 100644
--- a/libavdevice/v4l2.c
+++ b/libavdevice/v4l2.c
@@ -453,8 +453,10 @@ static int v4l2_set_parameters(AVFormatContext *s1, AVFormatParameters *ap)
 
     streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
+#if FF_API_FORMAT_PARAMETERS
     if (ap->channel > 0)
         s->channel = ap->channel;
+#endif
 
     /* set tv video input */
     memset (&input, 0, sizeof (input));
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 424fc920b4..11dbe8b2de 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -235,8 +235,8 @@ typedef struct AVFormatParameters {
     int width;
     int height;
     enum PixelFormat pix_fmt;
-    int channel; /**< Used to select DV channel. */
 #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 unsigned int mpeg2ts_raw:1;  /**< deprecated, use mpegtsraw demuxer */
     /**< deprecated, use mpegtsraw demuxer-specific options instead */