dvbsubdec: don't hardcode subtitle colors count in dvbsubdec to 16

[ffmpeg] / libavdevice / dv1394.c

diff --git a/libavdevice/dv1394.c b/libavdevice/dv1394.c
index 63eff2aec8b530bc404d12e827c679c5fa635dc2..779117aee3a8a3b4cb79001c796f18cf5e2aa409 100644 (file)
--- a/libavdevice/dv1394.c
+++ b/libavdevice/dv1394.c
@@ -90,18 +90,6 @@ 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;
-    }
-
-    if (ap->channel)
-        dv->channel = ap->channel;
-#endif
-
     /* Open and initialize DV1394 device */
     dv->fd = open(context->filename, O_RDONLY);
     if (dv->fd < 0) {