[FFmpeg-cvslog] r23374 - in branches/0.6: . Changelog configure doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/libvpxdec.c
siretart
subversion
Sat May 29 16:03:03 CEST 2010
Author: siretart
Date: Sat May 29 16:03:03 2010
New Revision: 23374
Log:
VP8 decoding via libvpx
Patch by James Zern for Google, Inc., jzern google com
backportd r23191,23303,23307-23308 by conrad, cehoyos and mstorsjo
Added:
branches/0.6/libavcodec/libvpxdec.c
- copied, changed from r23303, trunk/libavcodec/libvpxdec.c
Modified:
branches/0.6/ (props changed)
branches/0.6/Changelog
branches/0.6/configure
branches/0.6/doc/general.texi
branches/0.6/libavcodec/Makefile
branches/0.6/libavcodec/allcodecs.c
branches/0.6/libavcodec/avcodec.h
Modified: branches/0.6/Changelog
==============================================================================
--- branches/0.6/Changelog Sat May 29 15:11:56 2010 (r23373)
+++ branches/0.6/Changelog Sat May 29 16:03:03 2010 (r23374)
@@ -1,7 +1,6 @@
Entries are sorted chronologically from oldest to youngest within each release,
releases are sorted from youngest to oldest.
-
version 0.6:
- PB-frame decoding for H.263
@@ -79,6 +78,7 @@ version 0.6:
- faster H.264 decoding
- low overhead Ogg muxing
- WebM support in Matroska demuxer
+- VP8 decoding via libvpx
Modified: branches/0.6/configure
==============================================================================
--- branches/0.6/configure Sat May 29 15:11:56 2010 (r23373)
+++ branches/0.6/configure Sat May 29 16:03:03 2010 (r23374)
@@ -183,6 +183,7 @@ External library support:
--enable-libtheora enable Theora encoding via libtheora [no]
--enable-libvorbis enable Vorbis encoding via libvorbis,
native implementation exists [no]
+ --enable-libvpx enable VP8 support via libvpx [no]
--enable-libx264 enable H.264 encoding via x264 [no]
--enable-libxvid enable Xvid encoding via xvidcore,
native MPEG-4/Xvid encoder exists [no]
@@ -927,6 +928,7 @@ CONFIG_LIST="
libspeex
libtheora
libvorbis
+ libvpx
libx264
libxvid
lpc
@@ -1349,6 +1351,7 @@ libschroedinger_encoder_deps="libschroed
libspeex_decoder_deps="libspeex"
libtheora_encoder_deps="libtheora"
libvorbis_encoder_deps="libvorbis"
+libvpx_decoder_deps="libvpx"
libx264_encoder_deps="libx264"
libxvid_encoder_deps="libxvid"
@@ -2612,6 +2615,7 @@ enabled libschroedinger && add_cflags $(
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 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 libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm &&
{ check_cpp_condition x264.h "X264_BUILD >= 83" ||
die "ERROR: libx264 version must be >= 0.83."; }
@@ -2881,6 +2885,7 @@ echo "libschroedinger enabled ${libsch
echo "libspeex enabled ${libspeex-no}"
echo "libtheora enabled ${libtheora-no}"
echo "libvorbis enabled ${libvorbis-no}"
+echo "libvpx enabled ${libvpx-no}"
echo "libx264 enabled ${libx264-no}"
echo "libxvid enabled ${libxvid-no}"
echo "zlib enabled ${zlib-no}"
Modified: branches/0.6/doc/general.texi
==============================================================================
--- branches/0.6/doc/general.texi Sat May 29 15:11:56 2010 (r23373)
+++ branches/0.6/doc/general.texi Sat May 29 16:03:03 2010 (r23374)
@@ -437,6 +437,8 @@ following image formats are supported:
@tab fourcc: VP50
@item On2 VP6 @tab @tab X
@tab fourcc: VP60,VP61,VP62
+ at item VP8 @tab @tab X
+ @tab fourcc: VP80, decoding supported through external library libvpx
@item planar RGB @tab @tab X
@tab fourcc: 8BPS
@item Q-team QPEG @tab @tab X
Modified: branches/0.6/libavcodec/Makefile
==============================================================================
--- branches/0.6/libavcodec/Makefile Sat May 29 15:11:56 2010 (r23373)
+++ branches/0.6/libavcodec/Makefile Sat May 29 16:03:03 2010 (r23374)
@@ -525,6 +525,7 @@ OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER)
OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o
+OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o
OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o
OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvidff.o libxvid_rc.o
Modified: branches/0.6/libavcodec/allcodecs.c
==============================================================================
--- branches/0.6/libavcodec/allcodecs.c Sat May 29 15:11:56 2010 (r23373)
+++ branches/0.6/libavcodec/allcodecs.c Sat May 29 16:03:03 2010 (r23374)
@@ -344,6 +344,7 @@ void avcodec_register_all(void)
REGISTER_DECODER (LIBSPEEX, libspeex);
REGISTER_ENCODER (LIBTHEORA, libtheora);
REGISTER_ENCODER (LIBVORBIS, libvorbis);
+ REGISTER_DECODER (LIBVPX, libvpx);
REGISTER_ENCODER (LIBX264, libx264);
REGISTER_ENCODER (LIBXVID, libxvid);
Modified: branches/0.6/libavcodec/avcodec.h
==============================================================================
--- branches/0.6/libavcodec/avcodec.h Sat May 29 15:11:56 2010 (r23373)
+++ branches/0.6/libavcodec/avcodec.h Sat May 29 16:03:03 2010 (r23374)
@@ -30,8 +30,8 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 66
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MINOR 69
+#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -210,6 +210,7 @@ enum CodecID {
CODEC_ID_IFF_BYTERUN1,
CODEC_ID_KGV1,
CODEC_ID_YOP,
+ CODEC_ID_VP8,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,
Copied and modified: branches/0.6/libavcodec/libvpxdec.c (from r23303, trunk/libavcodec/libvpxdec.c)
==============================================================================
--- trunk/libavcodec/libvpxdec.c Tue May 25 03:19:08 2010 (r23303, copy source)
+++ branches/0.6/libavcodec/libvpxdec.c Sat May 29 16:03:03 2010 (r23374)
@@ -24,8 +24,8 @@
*/
#define VPX_CODEC_DISABLE_COMPAT 1
-#include <vpx_decoder.h>
-#include <vp8dx.h>
+#include <vpx/vpx_decoder.h>
+#include <vpx/vp8dx.h>
#include "avcodec.h"
More information about the ffmpeg-cvslog
mailing list