diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-01 02:26:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-01 02:43:47 +0300 |
| commit | cf9edda1d370d39bc8a3d020a9c2bc4090d2457e (patch) | |
| tree | 1d1bbc529a4e8109fb6aa5cadf0dbbb7bd61013a /libmpdemux | |
| parent | 7af8417ae7beb409f54849956a7037bc66c4c334 (diff) | |
| parent | 1c37a6427abef0827c608d328d37ca1b1a0a022d (diff) | |
| download | mpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.bz2 mpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.xz | |
Merge svn changes up to r29117
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mf.c | 5 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 4 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 | ||||
| -rw-r--r-- | libmpdemux/ms_hdr.h | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index f7c241feed..dc990c0b8f 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -58,6 +58,8 @@ static int demux_mf_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds){ return 1; } +// force extension/type to have a fourcc + static const struct { const char *type; uint32_t format; @@ -65,6 +67,9 @@ static const struct { { "bmp", mmioFOURCC('b', 'm', 'p', ' ') }, { "jpeg", mmioFOURCC('I', 'J', 'P', 'G') }, { "jpg", mmioFOURCC('I', 'J', 'P', 'G') }, + { "jls", mmioFOURCC('I', 'J', 'P', 'G') }, + { "thm", mmioFOURCC('I', 'J', 'P', 'G') }, + { "db", mmioFOURCC('I', 'J', 'P', 'G') }, { "pcx", mmioFOURCC('p', 'c', 'x', ' ') }, { "png", mmioFOURCC('M', 'P', 'N', 'G') }, { "ptx", mmioFOURCC('p', 't', 'x', ' ') }, diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 4347feee0b..e9f577ae65 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -260,6 +260,10 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) sh->opts = demuxer->opts; mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid); } + if (sid == demuxer->opts->sub_id) { + demuxer->sub->id = id; + demuxer->sub->sh = demuxer->s_streams[id]; + } return demuxer->s_streams[id]; } diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 275112ac1a..98564b5916 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -59,6 +59,7 @@ static const AVCodecTag mp_wav_override_tags[] = { { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_PCM_S16LE, 1}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, + { CODEC_ID_PCM_S24LE, 1}, { 0, 0 }, }; diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 6b810569d7..89f95ecbc3 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -27,7 +27,7 @@ typedef struct __attribute__((__packed__)) mpeglayer3waveformat_tag { #endif /* _MPEGLAYER3WAVEFORMAT_ */ /* windows.h #includes wingdi.h on MinGW. */ -#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_H) +#if !defined(_BITMAPINFOHEADER_) && !defined(_WINGDI_) #define _BITMAPINFOHEADER_ typedef struct __attribute__((__packed__)) { |