diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-11-07 20:22:32 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-11-07 20:22:32 +0000 |
| commit | a0ddef24ced504abeaccb4d23e051831a0998298 (patch) | |
| tree | 8d9817e08a97a465ae80a050cb4233f8552cffe1 | |
| parent | e282e5edb4bfea47c5b710322fd9bfe6f1ee9220 (diff) | |
| download | ffmpeg-a0ddef24ced504abeaccb4d23e051831a0998298.tar.gz | |
Rename ogg2.[ch] to oggdec.[ch].
Originally committed as revision 10943 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/oggdec.c (renamed from libavformat/ogg2.c) | 2 | ||||
| -rw-r--r-- | libavformat/oggdec.h (renamed from libavformat/ogg2.h) | 6 | ||||
| -rw-r--r-- | libavformat/oggparseflac.c | 2 | ||||
| -rw-r--r-- | libavformat/oggparseogm.c | 2 | ||||
| -rw-r--r-- | libavformat/oggparsetheora.c | 2 | ||||
| -rw-r--r-- | libavformat/oggparsevorbis.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 45a8a4889d..2bc7efc0d5 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -107,7 +107,7 @@ OBJS-$(CONFIG_NULL_MUXER) += raw.o OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o riff.o OBJS-$(CONFIG_NUT_MUXER) += nutenc.o nut.o riff.o OBJS-$(CONFIG_NUV_DEMUXER) += nuv.o riff.o -OBJS-$(CONFIG_OGG_DEMUXER) += ogg2.o \ +OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ oggparsevorbis.o \ oggparsetheora.o \ oggparseflac.o \ diff --git a/libavformat/ogg2.c b/libavformat/oggdec.c index 0c03634042..03377d9cfa 100644 --- a/libavformat/ogg2.c +++ b/libavformat/oggdec.c @@ -31,7 +31,7 @@ #include <stdio.h> -#include "ogg2.h" +#include "oggdec.h" #include "avformat.h" #define MAX_PAGE_SIZE 65307 diff --git a/libavformat/ogg2.h b/libavformat/oggdec.h index 656a3f95aa..da79c0a6e8 100644 --- a/libavformat/ogg2.h +++ b/libavformat/oggdec.h @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. **/ -#ifndef FFMPEG_OGG2_H -#define FFMPEG_OGG2_H +#ifndef FFMPEG_OGGDEC_H +#define FFMPEG_OGGDEC_H #include "avformat.h" @@ -84,4 +84,4 @@ extern ogg_codec_t ogm_old_codec; extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size); -#endif /* FFMPEG_OGG2_H */ +#endif /* FFMPEG_OGGDEC_H */ diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c index d8eff05b0f..611a8c5a1b 100644 --- a/libavformat/oggparseflac.c +++ b/libavformat/oggparseflac.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include "avformat.h" #include "bitstream.h" -#include "ogg2.h" +#include "oggdec.h" #define FLAC_STREAMINFO_SIZE 0x22 diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index aee47aba87..edafd65289 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -27,7 +27,7 @@ #include "bitstream.h" #include "bytestream.h" #include "intreadwrite.h" -#include "ogg2.h" +#include "oggdec.h" #include "riff.h" static int diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c index 8fb57ebd5a..617d1ded51 100644 --- a/libavformat/oggparsetheora.c +++ b/libavformat/oggparsetheora.c @@ -26,7 +26,7 @@ #include "avformat.h" #include "bitstream.h" #include "bswap.h" -#include "ogg2.h" +#include "oggdec.h" typedef struct theora_params { int gpshift; diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c index e60efdaa30..d1f260a80e 100644 --- a/libavformat/oggparsevorbis.c +++ b/libavformat/oggparsevorbis.c @@ -27,7 +27,7 @@ #include "bitstream.h" #include "bytestream.h" #include "bswap.h" -#include "ogg2.h" +#include "oggdec.h" #include "avstring.h" extern int |