Remove video_grab_ prefix from video_grab_{bktr,v4l}

Originally committed as revision 10411 to svn://svn.ffmpeg.org/ffmpeg/trunk

configure

@@ -780,6 +780,7 @@ libxvid_encoder_deps="libxvid"
 ac3_demuxer_deps="ac3_parser"
 audio_demuxer_deps_any="audio_oss audio_beos"
 audio_muxer_deps_any="audio_oss audio_beos"
+bktr_demuxer_deps="bktr"
 dv1394_demuxer_deps="dv1394"
 libdc1394_demuxer_deps="libdc1394"
 libnut_demuxer_deps="libnut"
@@ -791,8 +792,7 @@ rtp_muxer_deps="network mpegts_demuxer"
 rtsp_demuxer_deps="rtp_protocol rtp_muxer"
 sdp_demuxer_deps="rtsp_demuxer"
 v4l2_demuxer_deps="v4l2"
-video_grab_bktr_demuxer_deps="bktr"
-video_grab_v4l_demuxer_deps="v4l"
+v4l_demuxer_deps="v4l"
 x11_grab_device_demuxer_deps="x11grab"
 
 # protocols

libavformat/Makefile

@@ -32,6 +32,7 @@ OBJS-$(CONFIG_AVI_MUXER)                 += avienc.o riff.o
 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_TIERTEXSEQ_DEMUXER)        += tiertexseq.o
 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

libavformat/allformats.c

@@ -62,6 +62,7 @@ void av_register_all(void)
 #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 @@ void av_register_all(void)
     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);

libavformat/allformats.h

@@ -36,6 +36,7 @@ extern AVInputFormat avi_demuxer;
 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 tiertexseq_demuxer;
 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;

libavformat/grab.c

@@ -369,7 +369,7 @@ static int grab_read_close(AVFormatContext *s1)
     return 0;
 }
 
-AVInputFormat video_grab_v4l_demuxer = {
+AVInputFormat v4l_demuxer = {
     "video4linux",
     "video grab",
     sizeof(VideoData),

libavformat/grab_bktr.c

@@ -308,7 +308,7 @@ static int grab_read_close(AVFormatContext *s1)
     return 0;
 }
 
-AVInputFormat video_grab_bktr_demuxer = {
+AVInputFormat bktr_demuxer = {
     "bktr",
     "video grab",
     sizeof(VideoData),