From 1c010f2202d2df2a827cadf867944436499a2eb6 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 6 Jul 2008 15:12:32 +0000 Subject: Add standard license header for NuppelVideo, i.e. GPL v2+. The code taken from NuppelVideo consists of just a bunch of struct definitions, which are not copyrightable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27224 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/nuppelvideo.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h index 5534318e82..e12c1eb325 100644 --- a/libmpdemux/nuppelvideo.h +++ b/libmpdemux/nuppelvideo.h @@ -1,4 +1,21 @@ -/* nuppelvideo.h rh */ +/* + nuppelvideo.h taken from NuppelVideo, by + (c) Roman Hochleitner roman@mars.tuwien.ac.at + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ #ifndef MPLAYER_NUPPELVIDEO_H #define MPLAYER_NUPPELVIDEO_H -- cgit v1.2.3 From a77608b67a00f2e584c5e08da13c81c9e7027f18 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 7 Jul 2008 12:17:46 +0000 Subject: Add support for MLP audio through FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27232 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/mp_taglists.c | 1 + 1 file changed, 1 insertion(+) (limited to 'libmpdemux') diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 4fcc95d6bd..39e8b76d92 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -32,6 +32,7 @@ static const AVCodecTag mp_wav_tags[] = { { CODEC_ID_COOK, MKTAG('c', 'o', 'o', 'k')}, { CODEC_ID_DSICINAUDIO, MKTAG('D', 'C', 'I', 'A')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, + { CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')}, { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')}, { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, -- cgit v1.2.3 From 8365a97450533b04b87a89f8ab251be8d2c714b9 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 8 Jul 2008 08:17:50 +0000 Subject: Use correct PRIu64 length modifier for uint64_t value, fixes the warning: libmpdemux/mpeg_packetizer.c:61: warning: format '%lu' expects type 'long unsigned int', but argument 6 has type 'uint64_t' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27233 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/mpeg_packetizer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/mpeg_packetizer.c b/libmpdemux/mpeg_packetizer.c index 72f2fdb188..0b4c2437e5 100644 --- a/libmpdemux/mpeg_packetizer.c +++ b/libmpdemux/mpeg_packetizer.c @@ -58,7 +58,7 @@ send_mpeg_pes_packet_ll(unsigned char *data, int len, int id, uint64_t pts, unsigned char pes_header[PES_MAX_SIZE]; mp_msg (MSGT_HEADER, MSGL_DBG2, - "MPEG%d PES packet: 0x%x => %lu \n", type, id, pts); + "MPEG%d PES packet: 0x%x => %"PRIu64" \n", type, id, pts); memset (pes_header, '\0', PES_MAX_SIZE); /* startcode */ -- cgit v1.2.3