diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-09 18:32:51 +0300 |
| commit | ca3feba5c339f12141bf335e5592967caccc290b (patch) | |
| tree | 06ec4960d34fd7a50c6efb80f8e017b2f4ab5d99 /libmpdemux | |
| parent | 8ea134bd23022afbe1a06c0241c0c2c6ea2618f8 (diff) | |
| parent | 8760b0cb71dc6aa9c08d926712e64218931a1782 (diff) | |
| download | mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.bz2 mpv-ca3feba5c339f12141bf335e5592967caccc290b.tar.xz | |
Merge svn changes up to r27242
Conflicts:
Makefile
configure
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 | ||||
| -rw-r--r-- | libmpdemux/mpeg_packetizer.c | 2 | ||||
| -rw-r--r-- | libmpdemux/nuppelvideo.h | 19 |
3 files changed, 20 insertions, 2 deletions
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')}, 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 */ 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 |