summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-26 20:28:12 +0000
committerrtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-06-26 20:28:12 +0000
commitd477750980b6719d4ab31ef444bf72c6e25c3378 (patch)
tree48370635d9eb2efa4be637698f8333023504ee1b
parent0a4c99abd902e8f928a0835161ac62cf777cf473 (diff)
downloadmpv-d477750980b6719d4ab31ef444bf72c6e25c3378.tar.bz2
mpv-d477750980b6719d4ab31ef444bf72c6e25c3378.tar.xz
FFmpeg theora decoder support
It works only with libavformat demuxer git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15824 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--etc/codecs.conf3
-rw-r--r--libmpcodecs/vd_ffmpeg.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index 7e8b3a8c34..7957b0c489 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -1264,7 +1264,8 @@ videocodec ffvp3
videocodec fftheora
info "FFmpeg Theora"
status untested
- fourcc theo,Thra
+ fourcc theo
+ fourcc Thra theo
format 0xFFFC
driver ffmpeg
dll "theora"
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 6642b5ab4b..d80f30ae7b 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -336,7 +336,8 @@ static int init(sh_video_t *sh){
sh->format == mmioFOURCC('F','L','I','C') ||
sh->format == mmioFOURCC('S','N','O','W') ||
sh->format == mmioFOURCC('a','v','c','1') ||
- sh->format == mmioFOURCC('L','O','C','O')
+ sh->format == mmioFOURCC('L','O','C','O') ||
+ sh->format == mmioFOURCC('t','h','e','o')
))
{
avctx->extradata_size = sh->bih->biSize-sizeof(BITMAPINFOHEADER);