Mercurial > mplayer.hg

changeset 34219:f25ac0f261f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restore NUV1 internal fourcc. Fixes playback of http://samples.mplayerhq.hu/nuv/nirvana.nuv
author reimar
date Sat, 05 Nov 2011 22:18:13 +0000
parents fb4ff8e46d79
children 9f7eb00ed9f8
files etc/codecs.conf libmpdemux/mp_taglists.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/etc/codecs.conf	Sat Nov 05 19:11:21 2011 +0000
+++ b/etc/codecs.conf	Sat Nov 05 22:18:13 2011 +0000
@@ -469,7 +469,9 @@
 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
--- a/libmpdemux/mp_taglists.c	Sat Nov 05 19:11:21 2011 +0000
+++ b/libmpdemux/mp_taglists.c	Sat Nov 05 22:18:13 2011 +0000
@@ -120,7 +120,7 @@
     { 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')},