1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-23 07:12:39 +00:00
mpv/libmpdemux
wm4 87f4cafe9c Merge remote-tracking branch 'origin/master'
Conflicts:
	command.c
	libao2/ao_alsa.c
	libao2/ao_dsound.c
	libao2/ao_pulse.c
	libao2/audio_out.h
	mixer.c
	mixer.h
	mplayer.c

Replace my mixer changes with uau's implementation, which is based on
my code.
2012-04-28 00:54:26 +02:00
..
aac_hdr.c
aac_hdr.h
asf.h cosmetics: asf.h: Fix comment error 2011-07-06 06:52:22 +03:00
asfguid.h
asfheader.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
asfheader.h
aviheader.c aviheader.c: silence a warning 2012-02-29 02:49:48 +02:00
aviheader.h cleanup: Silence compilation warnings on MinGW-w64 2012-03-01 00:22:30 +02:00
aviprint.c
aviprint.h
demux_aac.c
demux_asf.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_audio.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_avi.c
demux_avs.c
demux_avs.h
demux_cue.c core: add new support for reading .cue files 2012-01-18 04:25:19 +01:00
demux_demuxers.c demux_demuxers: fix seeking bug (--audiofile) 2011-10-23 03:29:42 +03:00
demux_edl.c
demux_film.c
demux_fli.c
demux_gif.c
demux_lavf.c demux_lavf: try harder to make up a frame rate 2012-04-14 03:27:53 +03:00
demux_lmlm4.c Don't print awkward negative seek message when playing directory 2012-02-19 17:16:05 +01:00
demux_mf.c windows support: unicode filenames 2012-03-09 20:48:54 +02:00
demux_mkv.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_mng.c
demux_mov.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_mov.h
demux_mpc.c
demux_mpg.c
demux_nemesi.c
demux_nsv.c
demux_nut.c
demux_ogg.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_ogg.h
demux_packet.h core, demux, vd_ffmpeg: pass side data from demux_lavf to vd_ffmpeg 2011-08-20 20:25:43 +03:00
demux_pva.c
demux_rawaudio.c
demux_rawdv.c
demux_rawvideo.c
demux_real.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_real.h
demux_realaud.c
demux_roq.c
demux_rtp_codec.cpp Update Libav API uses 2012-02-01 22:46:27 +02:00
demux_rtp_internal.h configure, build: remove --disable-libav support 2011-12-11 07:48:26 +02:00
demux_rtp.cpp configure, build: remove --disable-libav support 2011-12-11 07:48:26 +02:00
demux_rtp.h
demux_smjpeg.c
demux_ts.c cleanup: silence most of the clang warnings 2011-07-09 04:23:24 +03:00
demux_ts.h
demux_ty_osd.c
demux_ty_osd.h
demux_ty.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_viv.c
demux_vqf.c build: switch to libavutil bswap.h and intreadwrite.h 2012-02-01 22:46:27 +02:00
demux_xmms_plugin.h
demux_xmms.c
demux_y4m.c
demuxer.c Merge remote-tracking branch 'origin/master' into my_master 2012-03-05 22:24:57 +01:00
demuxer.h core: add new support for reading .cue files 2012-01-18 04:25:19 +01:00
ebml_defs.c
ebml_types.h
ebml.c Update Libav API uses 2012-02-01 22:46:27 +02:00
ebml.h
extension.c
genres.h
matroska.h
mf.c windows support: unicode filenames 2012-03-09 20:48:54 +02:00
mf.h
mp3_hdr.c
mp3_hdr.h
mp_taglists.c demux_lavf: use Libav RIFF tag lists directly 2012-02-01 22:46:27 +02:00
mp_taglists.h demux_lavf: use Libav RIFF tag lists directly 2012-02-01 22:46:27 +02:00
mpeg_hdr.c
mpeg_hdr.h
mpeg_packetizer.c
mpeg_packetizer.h
ms_hdr.h
parse_es.c
parse_es.h
parse_mp4.c
parse_mp4.h
qtpalette.h
stheader.h audio/video: delete buggy "dynamic plugin" code 2011-10-20 02:16:35 +03:00
video.c
yuv4mpeg_intern.h
yuv4mpeg_ratio.c
yuv4mpeg.c
yuv4mpeg.h