summaryrefslogtreecommitdiff
path: root/src/libffmpeg/xine_decoder.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2003-05-09 23:54:05 +0000
committerMike Melanson <mike@multimedia.cx>2003-05-09 23:54:05 +0000
commit2501ad08791d23b9b925f073644ef3ebbab8f66e (patch)
tree83b9cab2862a5bfc1e1b534c0d62af391a524fa1 /src/libffmpeg/xine_decoder.c
parent111c5a7f3161338352c6261085536523decc4943 (diff)
downloadxine-lib-2501ad08791d23b9b925f073644ef3ebbab8f66e.tar.gz
xine-lib-2501ad08791d23b9b925f073644ef3ebbab8f66e.tar.bz2
enable ffmpeg's open source SVQ3 decoder
CVS patchset: 4809 CVS date: 2003/05/09 23:54:05
Diffstat (limited to 'src/libffmpeg/xine_decoder.c')
-rw-r--r--src/libffmpeg/xine_decoder.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index 68c0cbdc2..e7edb5b59 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_decoder.c,v 1.117 2003/05/01 02:01:58 tmmm Exp $
+ * $Id: xine_decoder.c,v 1.118 2003/05/09 23:54:05 tmmm Exp $
*
* xine decoder plugin using ffmpeg
*
@@ -722,6 +722,11 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
= strdup ("Sorenson Video 1 (ffmpeg)");
break;
+ case BUF_VIDEO_SORENSON_V3:
+ this->codec = avcodec_find_decoder (CODEC_ID_SVQ3);
+ this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
+ = strdup ("Sorenson Video 3 (ffmpeg)");
+ break;
case BUF_VIDEO_DV:
this->codec = avcodec_find_decoder (CODEC_ID_DVVIDEO);
this->stream->meta_info[XINE_META_INFO_VIDEOCODEC]
@@ -983,6 +988,7 @@ void avcodec_register_all(void)
register_avcodec(&h263i_decoder);
register_avcodec(&rv10_decoder);
register_avcodec(&svq1_decoder);
+ register_avcodec(&svq3_decoder);
register_avcodec(&wmav1_decoder);
register_avcodec(&wmav2_decoder);
register_avcodec(&indeo3_decoder);
@@ -1410,6 +1416,7 @@ static uint32_t supported_video_types[] = {
BUF_VIDEO_IV31,
BUF_VIDEO_IV32,
BUF_VIDEO_SORENSON_V1,
+ BUF_VIDEO_SORENSON_V3,
BUF_VIDEO_JPEG,
BUF_VIDEO_MPEG,
BUF_VIDEO_DV,