Author: reimar Date: Sat Nov 5 23:18:13 2011 New Revision: 34307 Log: Restore NUV1 internal fourcc. Fixes playback of http://samples.mplayerhq.hu/nuv/nirvana.nuv Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Nov 5 20:11:21 2011 (r34306) +++ trunk/etc/codecs.conf Sat Nov 5 23:18:13 2011 (r34307) @@ -469,7 +469,9 @@ videocodec mpegpes videocodec ffnuv info "NuppelVideo" status working - fourcc NUV1 ; former internal MPlayer FOURCC + fourcc NUV1 ; internal MPlayer FOURCC + ; note that RJPG is _not_ equivalent, + ; these are slightly different formats fourcc RJPG driver ffmpeg dll nuv Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Sat Nov 5 20:11:21 2011 (r34306) +++ trunk/libmpdemux/mp_taglists.c Sat Nov 5 23:18:13 2011 (r34307) @@ -120,7 +120,7 @@ static const struct AVCodecTag mp_bmp_ta { CODEC_ID_MDEC, MKTAG('M', 'D', 'E', 'C')}, { CODEC_ID_MOTIONPIXELS, MKTAG('M', 'V', 'I', '1')}, { CODEC_ID_MXPEG, MKTAG('M', 'X', 'P', 'G')}, - { CODEC_ID_NUV, MKTAG('R', 'J', 'P', 'G')}, + { CODEC_ID_NUV, MKTAG('N', 'U', 'V', '1')}, { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, { CODEC_ID_RV10, MKTAG('R', 'V', '1', '0')},