Mercurial > mplayer.hg
changeset 33940:5eae72fa20ff
Do not map to internal MPlayer FourCC if possible.
| author | cehoyos |
|---|---|
| date | Wed, 31 Aug 2011 09:04:21 +0000 |
| parents | d455f7786971 |
| children | 8beec562ce0e |
| files | etc/codecs.conf libmpdemux/mp_taglists.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/codecs.conf Mon Aug 29 12:48:21 2011 +0000 +++ b/etc/codecs.conf Wed Aug 31 09:04:21 2011 +0000 @@ -447,7 +447,7 @@ videocodec ffnuv info "NuppelVideo" status working - fourcc NUV1 ; NUV1 is an internal MPlayer FOURCC + fourcc NUV1 ; former internal MPlayer FOURCC fourcc RJPG driver ffmpeg dll nuv @@ -4313,7 +4313,7 @@ audiocodec ffnellymoser info "FFmpeg Nellymoser Audio" status working - fourcc "NELL" ; internal MPlayer FourCC + fourcc "NELL" ; former internal MPlayer FourCC fourcc nmos driver ffmpeg dll "nellymoser"
--- a/libmpdemux/mp_taglists.c Mon Aug 29 12:48:21 2011 +0000 +++ b/libmpdemux/mp_taglists.c Wed Aug 31 09:04:21 2011 +0000 @@ -42,7 +42,7 @@ { CODEC_ID_MP4ALS, MKTAG('A', 'L', 'S', ' ')}, { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')}, - { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, + { CODEC_ID_NELLYMOSER, MKTAG('n', 'm', 'o', 's')}, { CODEC_ID_PCM_LXF, MKTAG('P', 'L', 'X', 'F')}, { CODEC_ID_QCELP, MKTAG('Q', 'c', 'l', 'p')}, { CODEC_ID_QDM2, MKTAG('Q', 'D', 'M', '2')}, @@ -106,7 +106,7 @@ { 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')}, + { CODEC_ID_NUV, MKTAG('R', 'J', 'P', 'G')}, { CODEC_ID_RL2, MKTAG('R', 'L', '2', 'V')}, { CODEC_ID_ROQ, MKTAG('R', 'o', 'Q', 'V')}, { CODEC_ID_RV10, MKTAG('R', 'V', '1', '0')},