Commit be8ffec9 authored by Nick Kurshev's avatar Nick Kurshev

new codec: Sorenson v1

Originally committed as revision 726 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8db1a1dd
......@@ -14,7 +14,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
mpegvideo.o h263.o jrevdct.o jfdctfst.o \
mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \
motion_est.o imgconvert.o imgresample.o msmpeg4.o \
mpeg12.o h263dec.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \
mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \
ratecontrol.o
ASM_OBJS=
......
......@@ -65,6 +65,7 @@ void avcodec_register_all(void)
register_avcodec(&mpeg_decoder);
register_avcodec(&h263i_decoder);
register_avcodec(&rv10_decoder);
register_avcodec(&svq1_decoder);
register_avcodec(&mjpeg_decoder);
register_avcodec(&mp2_decoder);
register_avcodec(&mp3_decoder);
......
......@@ -5,8 +5,8 @@
#define LIBAVCODEC_VERSION_INT 0x000406
#define LIBAVCODEC_VERSION "0.4.6"
#define LIBAVCODEC_BUILD 4614
#define LIBAVCODEC_BUILD_STR "4614"
#define LIBAVCODEC_BUILD 4615
#define LIBAVCODEC_BUILD_STR "4615"
enum CodecID {
CODEC_ID_NONE,
......@@ -26,6 +26,7 @@ enum CodecID {
CODEC_ID_WMV2,
CODEC_ID_H263P,
CODEC_ID_H263I,
CODEC_ID_SVQ1,
/* various pcm "codecs" */
CODEC_ID_PCM_S16LE,
......@@ -53,6 +54,7 @@ enum PixelFormat {
PIX_FMT_BGR24,
PIX_FMT_YUV422P,
PIX_FMT_YUV444P,
PIX_FMT_YUV410P
};
/* currently unused, may be used if 24/32 bits samples ever supported */
......@@ -342,6 +344,7 @@ extern AVCodec wmv2_decoder;
extern AVCodec mpeg_decoder;
extern AVCodec h263i_decoder;
extern AVCodec rv10_decoder;
extern AVCodec svq1_decoder;
extern AVCodec mjpeg_decoder;
extern AVCodec mp2_decoder;
extern AVCodec mp3_decoder;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -199,6 +199,7 @@ const char *pix_fmt_str[] = {
"bgr24",
"yuv422p",
"yuv444p",
"yuv410p"
};
void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment