Merge CAPS branch
authorDavid Schleef <ds@schleef.org>
Mon, 22 Dec 2003 01:46:58 +0000 (01:46 +0000)
committerDavid Schleef <ds@schleef.org>
Mon, 22 Dec 2003 01:46:58 +0000 (01:46 +0000)
commit5153d56e2c953063c3fe4838af1666c775bae3fd
treec610768aee02cd785f624b1f9c66f869b50abdee
parent4ee3b353e9229eebf5599e4bea7b81a976fca8af
Merge CAPS branch

Original commit message from CVS:
Merge CAPS branch
ext/ffmpeg/gstffmpegcodecmap.c
ext/ffmpeg/gstffmpegcodecmap.h
ext/ffmpeg/gstffmpegcolorspace.c
ext/ffmpeg/gstffmpegdec.c
ext/ffmpeg/gstffmpegdemux.c
ext/ffmpeg/gstffmpegenc.c
ext/ffmpeg/gstffmpegmux.c