# HG changeset patch # User cehoyos # Date 1301210198 0 # Node ID 6bcfd2a73d43e354151e242876eda0bf8dc1b36f # Parent 67db78ffdb22e9474aac3fa45044bbab7ba86309 FFmpeg Bitmap Brothers JV decoder. diff -r 67db78ffdb22 -r 6bcfd2a73d43 etc/codecs.conf --- a/etc/codecs.conf Sun Mar 27 02:15:38 2011 +0000 +++ b/etc/codecs.conf Sun Mar 27 07:16:38 2011 +0000 @@ -3163,6 +3163,14 @@ 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 -r 67db78ffdb22 -r 6bcfd2a73d43 libmpdemux/mp_taglists.c --- a/libmpdemux/mp_taglists.c Sun Mar 27 02:15:38 2011 +0000 +++ b/libmpdemux/mp_taglists.c Sun Mar 27 07:16:38 2011 +0000 @@ -101,6 +101,7 @@ { 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')}, + { CODEC_ID_JV, MKTAG('F', 'F', 'J', 'V')}, { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')},