From 673a2c759788a7d3df1e0a6f9df929057724c449 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 27 Mar 2011 07:16:38 +0000
Subject: [PATCH] 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
---
 etc/codecs.conf          | 8 ++++++++
 libmpdemux/mp_taglists.c | 3 +++
 2 files changed, 11 insertions(+)

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')},