# HG changeset patch
# User ramiro
# Date 1189016998 0
# Node ID 7d80b6e8adecf94b4897b587ed2147932d2c62ed
# Parent  eb2ffde46a50a07189f1ae3a970a142039b2fcb3
Remove video_grab_ prefix from video_grab_{bktr,v4l}

diff -r eb2ffde46a50 -r 7d80b6e8adec Makefile
--- a/Makefile	Wed Sep 05 17:25:39 2007 +0000
+++ b/Makefile	Wed Sep 05 18:29:58 2007 +0000
@@ -32,6 +32,7 @@
 OBJS-$(CONFIG_AVISYNTH)                  += avisynth.o
 OBJS-$(CONFIG_AVS_DEMUXER)               += avs.o vocdec.o voc.o
 OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
+OBJS-$(CONFIG_BKTR_DEMUXER)              += grab_bktr.o
 OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
 OBJS-$(CONFIG_CRC_MUXER)                 += crc.o
 OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
@@ -137,9 +138,8 @@
 OBJS-$(CONFIG_TTA_DEMUXER)               += tta.o
 OBJS-$(CONFIG_TXD_DEMUXER)               += txd.o
 OBJS-$(CONFIG_V4L2_DEMUXER)              += v4l2.o
+OBJS-$(CONFIG_V4L_DEMUXER)               += grab.o
 OBJS-$(CONFIG_VC1_DEMUXER)               += raw.o
-OBJS-$(CONFIG_VIDEO_GRAB_BKTR_DEMUXER)   += grab_bktr.o
-OBJS-$(CONFIG_VIDEO_GRAB_V4L_DEMUXER)    += grab.o
 OBJS-$(CONFIG_VMD_DEMUXER)               += sierravmd.o
 OBJS-$(CONFIG_VOC_DEMUXER)               += vocdec.o voc.o
 OBJS-$(CONFIG_VOC_MUXER)                 += vocenc.o voc.o
diff -r eb2ffde46a50 -r 7d80b6e8adec allformats.c
--- a/allformats.c	Wed Sep 05 17:25:39 2007 +0000
+++ b/allformats.c	Wed Sep 05 18:29:58 2007 +0000
@@ -62,6 +62,7 @@
 #endif
     REGISTER_DEMUXER (AVS, avs);
     REGISTER_DEMUXER (BETHSOFTVID, bethsoftvid);
+    REGISTER_DEMUXER (BKTR, bktr);
     REGISTER_DEMUXER (C93, c93);
     REGISTER_MUXER   (CRC, crc);
     REGISTER_DEMUXER (DAUD, daud);
@@ -152,9 +153,8 @@
     REGISTER_DEMUXER (TTA, tta);
     REGISTER_DEMUXER (TXD, txd);
     REGISTER_DEMUXER (V4L2, v4l2);
+    REGISTER_DEMUXER (V4L, v4l);
     REGISTER_DEMUXER (VC1, vc1);
-    REGISTER_DEMUXER (VIDEO_GRAB_BKTR, video_grab_bktr);
-    REGISTER_DEMUXER (VIDEO_GRAB_V4L, video_grab_v4l);
     REGISTER_DEMUXER (VMD, vmd);
     REGISTER_MUXDEMUX(VOC, voc);
     REGISTER_MUXDEMUX(WAV, wav);
diff -r eb2ffde46a50 -r 7d80b6e8adec allformats.h
--- a/allformats.h	Wed Sep 05 17:25:39 2007 +0000
+++ b/allformats.h	Wed Sep 05 18:29:58 2007 +0000
@@ -36,6 +36,7 @@
 extern AVInputFormat avisynth_demuxer;
 extern AVInputFormat avs_demuxer;
 extern AVInputFormat bethsoftvid_demuxer;
+extern AVInputFormat bktr_demuxer;
 extern AVInputFormat c93_demuxer;
 extern AVInputFormat daud_demuxer;
 extern AVInputFormat dsicin_demuxer;
@@ -105,9 +106,8 @@
 extern AVInputFormat tta_demuxer;
 extern AVInputFormat txd_demuxer;
 extern AVInputFormat v4l2_demuxer;
+extern AVInputFormat v4l_demuxer;
 extern AVInputFormat vc1_demuxer;
-extern AVInputFormat video_grab_bktr_demuxer;
-extern AVInputFormat video_grab_v4l_demuxer;
 extern AVInputFormat vmd_demuxer;
 extern AVInputFormat voc_demuxer;
 extern AVInputFormat wav_demuxer;
diff -r eb2ffde46a50 -r 7d80b6e8adec grab.c
--- a/grab.c	Wed Sep 05 17:25:39 2007 +0000
+++ b/grab.c	Wed Sep 05 18:29:58 2007 +0000
@@ -369,7 +369,7 @@
     return 0;
 }
 
-AVInputFormat video_grab_v4l_demuxer = {
+AVInputFormat v4l_demuxer = {
     "video4linux",
     "video grab",
     sizeof(VideoData),
diff -r eb2ffde46a50 -r 7d80b6e8adec grab_bktr.c
--- a/grab_bktr.c	Wed Sep 05 17:25:39 2007 +0000
+++ b/grab_bktr.c	Wed Sep 05 18:29:58 2007 +0000
@@ -308,7 +308,7 @@
     return 0;
 }
 
-AVInputFormat video_grab_bktr_demuxer = {
+AVInputFormat bktr_demuxer = {
     "bktr",
     "video grab",
     sizeof(VideoData),