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

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

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

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