Mercurial > libavformat.hg
changeset 2526:7d80b6e8adec libavformat
Remove video_grab_ prefix from video_grab_{bktr,v4l}
| author | ramiro |
|---|---|
| date | Wed, 05 Sep 2007 18:29:58 +0000 |
| parents | eb2ffde46a50 |
| children | 590fa259d1dd |
| files | Makefile allformats.c allformats.h grab.c grab_bktr.c |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);
--- 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;