diff options
author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-19 15:47:59 +0000 |
---|---|---|
committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-19 15:47:59 +0000 |
commit | b2e3df350aeec14da52b1eec7d25c8c7595f617a (patch) | |
tree | 92e2a08db961f1eb971a7763659f5af87ab716e9 | |
parent | 59d4f35fc3321b156cb15e746567a39fcff34a07 (diff) | |
download | mpv-b2e3df350aeec14da52b1eec7d25c8c7595f617a.tar.bz2 mpv-b2e3df350aeec14da52b1eec7d25c8c7595f617a.tar.xz |
Fix playback of Intel JPEG Library Video Codec.
Fixes r29770, which probably should not have been committed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29786 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | etc/codecs.conf | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index 0c19f945bf..e580d92183 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -1233,6 +1233,7 @@ videocodec ffmjpeg fourcc ACDV ; ACDSee jpeg fourcc SLMJ ; SL M-JPEG fourcc MVJP ; Midvid JPEG Video Codec + fourcc IJLV ; Intel JPEG Library Video Codec driver ffmpeg dll mjpeg out 444P @@ -1243,14 +1244,6 @@ videocodec ffmjpeg out RGB24 ; JPEG-LS out Y800 -videocodec ffijlv - info "FFmpeg flipped MJPEG" - status working - fourcc IJLV - driver ffmpeg - dll mjpeg - out 422P flip - videocodec ffmjpegb info "FFmpeg MJPEG-B" status working |