aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-09-05 18:44:06 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2007-09-05 18:44:06 +0000
commit7b1b62b23d1895829de193b8fa0c078e95628485 (patch)
tree96972e6c60ff7fe735b4d8bf80e592857bacfccc /libavformat
parentfd484da77a8452b1045942372f9983bd63352f87 (diff)
downloadffmpeg-7b1b62b23d1895829de193b8fa0c078e95628485.tar.gz
Give better filenames to bktr and v4l grabbers
Originally committed as revision 10412 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile4
-rw-r--r--libavformat/bktr.c (renamed from libavformat/grab_bktr.c)0
-rw-r--r--libavformat/v4l.c (renamed from libavformat/grab.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 04c74a1c67..14f216c1c3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -32,7 +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_BKTR_DEMUXER) += bktr.o
OBJS-$(CONFIG_C93_DEMUXER) += c93.o vocdec.o voc.o
OBJS-$(CONFIG_CRC_MUXER) += crc.o
OBJS-$(CONFIG_DAUD_DEMUXER) += daud.o
@@ -138,7 +138,7 @@ 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_V4L_DEMUXER) += v4l.o
OBJS-$(CONFIG_VC1_DEMUXER) += raw.o
OBJS-$(CONFIG_VMD_DEMUXER) += sierravmd.o
OBJS-$(CONFIG_VOC_DEMUXER) += vocdec.o voc.o
diff --git a/libavformat/grab_bktr.c b/libavformat/bktr.c
index 7bf51d797e..7bf51d797e 100644
--- a/libavformat/grab_bktr.c
+++ b/libavformat/bktr.c
diff --git a/libavformat/grab.c b/libavformat/v4l.c
index ac3cb0eda2..ac3cb0eda2 100644
--- a/libavformat/grab.c
+++ b/libavformat/v4l.c