diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-03-27 07:16:38 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-05-02 00:35:48 +0300 |
| commit | 673a2c759788a7d3df1e0a6f9df929057724c449 (patch) | |
| tree | 204df3982f08d41ffd7c850394fbc26043983d46 | |
| parent | a37b71dc329b4cfc828db9c166c94d1221f2d46c (diff) | |
| download | mpv-673a2c759788a7d3df1e0a6f9df929057724c449.tar.bz2 mpv-673a2c759788a7d3df1e0a6f9df929057724c449.tar.xz | |
codecs.conf, mp_taglists: add FFmpeg Bitmap Brothers JV decoder
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33125 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | etc/codecs.conf | 8 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf index d3df898ef8..6984effb55 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -3119,6 +3119,14 @@ videocodec fffraps dll "fraps" out BGR24,YV12,I420 +videocodec ffjv + info "FFmpeg Bitmap Brothers JV" + status working + fourcc FFJV ; internal MPlayer FourCC + driver ffmpeg + dll "jv" + out BGR8 + videocodec fftiertexseq info "FFmpeg Tiertex SEQ" status working diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 146edc42ea..632b0fd703 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -107,6 +107,9 @@ static const struct mp_AVCodecTag mp_bmp_tags[] = { { CODEC_ID_FLIC, MKTAG('F', 'L', 'I', 'C')}, { CODEC_ID_IDCIN, MKTAG('I', 'D', 'C', 'I')}, { CODEC_ID_INTERPLAY_VIDEO, MKTAG('I', 'N', 'P', 'V')}, +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 114, 0) + { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, +#endif { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, |