Commit e9fca39f authored by cehoyos's avatar cehoyos

VP8 encoding via libvpx.

Patch by James Zern, Google, Inc.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@23449 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 99446229
...@@ -7,7 +7,7 @@ version <next>: ...@@ -7,7 +7,7 @@ version <next>:
- WebM support in Matroska demuxer - WebM support in Matroska demuxer
- low overhead Ogg muxing - low overhead Ogg muxing
- MMS-TCP support - MMS-TCP support
- VP8 decoding via libvpx - VP8 de/encoding via libvpx
- CODEC_CAP_EXPERIMENTAL added - CODEC_CAP_EXPERIMENTAL added
- Demuxer for On2's IVF format - Demuxer for On2's IVF format
......
...@@ -1352,6 +1352,7 @@ libspeex_decoder_deps="libspeex" ...@@ -1352,6 +1352,7 @@ libspeex_decoder_deps="libspeex"
libtheora_encoder_deps="libtheora" libtheora_encoder_deps="libtheora"
libvorbis_encoder_deps="libvorbis" libvorbis_encoder_deps="libvorbis"
libvpx_decoder_deps="libvpx" libvpx_decoder_deps="libvpx"
libvpx_encoder_deps="libvpx"
libx264_encoder_deps="libx264" libx264_encoder_deps="libx264"
libxvid_encoder_deps="libxvid" libxvid_encoder_deps="libxvid"
...@@ -2623,7 +2624,8 @@ enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) && ...@@ -2623,7 +2624,8 @@ enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) &&
enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg
enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
enabled libvpx && require2 libvpx "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver" -lvpx enabled libvpx && require2 libvpx "vpx/vpx_decoder.h vpx/vp8dx.h" "vpx_codec_dec_init_ver" -lvpx &&
require2 libvpx "vpx/vpx_encoder.h vpx/vp8cx.h" "vpx_codec_enc_init_ver" -lvpx
enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm && enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm &&
{ check_cpp_condition x264.h "X264_BUILD >= 98" || { check_cpp_condition x264.h "X264_BUILD >= 98" ||
die "ERROR: libx264 version must be >= 0.98."; } die "ERROR: libx264 version must be >= 0.98."; }
......
...@@ -439,8 +439,8 @@ following image formats are supported: ...@@ -439,8 +439,8 @@ following image formats are supported:
@tab fourcc: VP50 @tab fourcc: VP50
@item On2 VP6 @tab @tab X @item On2 VP6 @tab @tab X
@tab fourcc: VP60,VP61,VP62 @tab fourcc: VP60,VP61,VP62
@item VP8 @tab @tab X @item VP8 @tab X @tab X
@tab fourcc: VP80, decoding supported through external library libvpx @tab fourcc: VP80, de/encoding supported through external library libvpx
@item planar RGB @tab @tab X @item planar RGB @tab @tab X
@tab fourcc: 8BPS @tab fourcc: 8BPS
@item Q-team QPEG @tab @tab X @item Q-team QPEG @tab @tab X
......
...@@ -537,6 +537,7 @@ OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o ...@@ -537,6 +537,7 @@ OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o
OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o
OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o
OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o
OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvidff.o libxvid_rc.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvidff.o libxvid_rc.o
......
...@@ -349,7 +349,7 @@ void avcodec_register_all(void) ...@@ -349,7 +349,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (LIBSPEEX, libspeex); REGISTER_DECODER (LIBSPEEX, libspeex);
REGISTER_ENCODER (LIBTHEORA, libtheora); REGISTER_ENCODER (LIBTHEORA, libtheora);
REGISTER_ENCODER (LIBVORBIS, libvorbis); REGISTER_ENCODER (LIBVORBIS, libvorbis);
REGISTER_DECODER (LIBVPX, libvpx); REGISTER_ENCDEC (LIBVPX, libvpx);
REGISTER_ENCODER (LIBX264, libx264); REGISTER_ENCODER (LIBX264, libx264);
REGISTER_ENCODER (LIBXVID, libxvid); REGISTER_ENCODER (LIBXVID, libxvid);
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 73 #define LIBAVCODEC_VERSION_MINOR 74
#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
......
This diff is collapsed.
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