diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 14:23:49 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 14:23:49 +0300 |
| commit | 70e0372a51ec0d040e996d56101b731a4b72d11d (patch) | |
| tree | 91b2f65db46d8846696ba83a3d61d526ab9380b5 /libmpdemux | |
| parent | e14d43f764c5043e5907852e09d61db912ee49f2 (diff) | |
| parent | c051bef87c5a7337b2aca3d4b77fc392a8392780 (diff) | |
| download | mpv-70e0372a51ec0d040e996d56101b731a4b72d11d.tar.bz2 mpv-70e0372a51ec0d040e996d56101b731a4b72d11d.tar.xz | |
Merge svn changes up to r26510
r26469 and r26470 (which revert files to inferior versions "because
it's policy") are ignored.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/Makefile | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_avs.c | 4 | ||||
| -rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 37c70ae82b..5bd6338ca7 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -68,6 +68,6 @@ SRCS_MENCODER-$(LIBAVFORMAT) += muxer_lavf.c include ../mpcommon.mak -demux_lavf.o mp_taglists.o: CFLAGS += -I../libavcodec +demux_lavf.o mp_taglists.o .depend: CFLAGS += -I../libavcodec -dep depend: CFLAGS += $(EXTRAXX_INC) +.depend: CFLAGS += $(EXTRAXX_INC) diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c index 9eac44fd19..2f8ec46bde 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -299,7 +299,7 @@ static demuxer_t* demux_open_avs(demuxer_t* demuxer) //sh_video->format = get_mmioFOURCC(AVS->video_info); sh_video->format = mmioFOURCC('Y', 'V', '1', '2'); - sh_video->fps = (float) ((float) AVS->video_info->fps_numerator / (float) AVS->video_info->fps_denominator); + sh_video->fps = (double) AVS->video_info->fps_numerator / (double) AVS->video_info->fps_denominator; sh_video->frametime = 1.0 / sh_video->fps; sh_video->bih = malloc(sizeof(BITMAPINFOHEADER) + (256 * 4)); @@ -430,6 +430,8 @@ static void demux_seek_avs(demuxer_t *demuxer, float rel_seek_secs, float audio_ sh_video->num_frames_decoded = AVS->frameno; sh_video->num_frames = AVS->frameno; } + video_pos += audio_delay; + if (video_pos < 0) video_pos = 0; if (sh_audio) AVS->sampleno = FFMIN(video_pos * sh_audio->samplerate, AVS->video_info->num_audio_samples); diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index 106b74861a..10e1b55e0b 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -60,6 +60,7 @@ const struct AVCodecTag *mp_wav_override_taglists[] = {mp_wav_override_tags, 0}; static const AVCodecTag mp_bmp_tags[] = { { CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'V')}, { CODEC_ID_BETHSOFTVID, MKTAG('B', 'E', 'T', 'H')}, + { CODEC_ID_BFI, MKTAG('B', 'F', 'I', 'V')}, { CODEC_ID_C93, MKTAG('C', '9', '3', 'V')}, { CODEC_ID_DSICINVIDEO, MKTAG('D', 'C', 'I', 'V')}, { CODEC_ID_DXA, MKTAG('D', 'X', 'A', '1')}, |