1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-28 18:53:02 +00:00
mpv/libmpdemux
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
..
aac_hdr.c
asf.h
asfguid.h
asfheader.c Give a CONFIG_ prefix to preprocessor directives that lacked one and 2008-08-07 12:20:50 +00:00
aviheader.c Mark some functions static 2008-04-23 13:48:38 +03:00
aviheader.h Add missing #includes that are required for things used in the header. 2008-06-17 09:09:36 +00:00
aviprint.c
demux_aac.c
demux_asf.c Avoid including avcodec.h in demuxer.h (and thus many other files) just to get 2008-07-17 17:14:12 +00:00
demux_audio.c changed 'Audio file' to 'Audio only' (to not get 'Audio file file' when played) 2008-07-29 11:17:52 +00:00
demux_avi.c Merge svn changes up to r27399 2008-08-02 22:04:35 +03:00
demux_avs.c Take audio delay into account when seeking in avisynth demuxer. 2008-04-23 07:50:54 +00:00
demux_avs.h cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:41:00 +00:00
demux_demuxers.c Make internal subtitle and subtitle switching work with -audiofile 2008-05-21 18:45:30 +00:00
demux_film.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:41:00 +00:00
demux_fli.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:41:00 +00:00
demux_gif.c Rename preprocessor directives related to image libraries. 2008-08-05 08:47:51 +00:00
demux_lavf.c Merge svn changes up to r27281 2008-07-15 02:59:27 +03:00
demux_lmlm4.c
demux_mf.c add ffptx , works on ptx samples 2008-05-12 02:09:47 +00:00
demux_mkv.c Merge svn changes up to r27374 2008-07-30 16:39:24 +03:00
demux_mov.c Merge svn changes up to r27441 2008-08-08 02:13:09 +03:00
demux_mpc.c
demux_mpg.c use demux_flush() where appropriate 2008-06-02 10:18:44 +00:00
demux_nemesi.c Merge svn changes up to r27092 2008-06-17 05:04:32 +03:00
demux_nsv.c
demux_nut.c
demux_nuv.c
demux_ogg.c Merge svn changes up to r27441 2008-08-08 02:13:09 +03:00
demux_pva.c
demux_rawaudio.c
demux_rawdv.c
demux_rawvideo.c
demux_real.c Avoid including avcodec.h in demuxer.h (and thus many other files) just to get 2008-07-17 17:14:12 +00:00
demux_realaud.c
demux_roq.c
demux_rtp_codec.cpp Start unifying names of internal preprocessor directives. 2008-07-30 12:01:30 +00:00
demux_rtp_internal.h Start unifying names of internal preprocessor directives. 2008-07-30 12:01:30 +00:00
demux_rtp.cpp Merge svn changes up to r27374 2008-07-30 16:39:24 +03:00
demux_rtp.h
demux_smjpeg.c
demux_ts.c Remove unused variable, fixes the warning: 2008-06-08 14:50:35 +00:00
demux_ty_osd.c Mike Baker agreed to relicense his parts of the code as GPL v2+ on IRC. 2008-05-07 08:01:51 +00:00
demux_ty.c Use standard license headers with standard formatting. 2008-05-14 18:01:51 +00:00
demux_viv.c Avoid including avcodec.h in demuxer.h (and thus many other files) just to get 2008-07-17 17:14:12 +00:00
demux_vqf.c
demux_xmms_plugin.h
demux_xmms.c cosmetics: Remove pointless parentheses from return statements. 2008-05-16 09:41:00 +00:00
demux_y4m.c
demuxer.c Merge svn changes up to r27441 2008-08-08 02:13:09 +03:00
demuxer.h Merge svn changes up to r27441 2008-08-08 02:13:09 +03:00
ebml.c
ebml.h
extension.c Start unifying names of internal preprocessor directives. 2008-07-30 12:01:30 +00:00
genres.h
matroska.h
mf.c
mf.h
mp3_hdr.c
mp3_hdr.h
mp_taglists.c add ffvp6a codec 2008-07-28 01:01:54 +00:00
mp_taglists.h
mpeg_hdr.c
mpeg_hdr.h
mpeg_packetizer.c Use correct PRIu64 length modifier for uint64_t value, fixes the warning: 2008-07-08 08:17:50 +00:00
mpeg_packetizer.h Use standard license headers with standard formatting. 2008-05-14 18:01:51 +00:00
ms_hdr.h
muxer_avi.c
muxer_lavf.c Use av_alloc_put_byte instead of custom protocol. 2008-05-21 18:21:05 +00:00
muxer_mpeg.c Start unifying names of internal preprocessor directives. 2008-07-30 12:01:30 +00:00
muxer_rawaudio.c
muxer_rawvideo.c Remove unnecessary version.h #includes. 2008-04-30 11:03:41 +00:00
muxer.c Start unifying names of internal preprocessor directives. 2008-07-30 12:01:30 +00:00
muxer.h
nuppelvideo.h Add standard license header for NuppelVideo, i.e. GPL v2+. 2008-07-06 15:12:32 +00:00
parse_es.c
parse_es.h
parse_mp4.c Mark some functions static 2008-04-23 13:48:38 +03:00
parse_mp4.h
qtpalette.h
stheader.h Merge svn changes up to r27441 2008-08-08 02:13:09 +03:00
video.c Give a CONFIG_ prefix to preprocessor directives that lacked one and 2008-08-07 12:20:50 +00:00
yuv4mpeg_intern.h Mark files that were imported from the MJPEG Tools suite as such. 2008-05-14 18:16:38 +00:00
yuv4mpeg_ratio.c Mark files that were imported from the MJPEG Tools suite as such. 2008-05-14 18:16:38 +00:00
yuv4mpeg.c Mark files that were imported from the MJPEG Tools suite as such. 2008-05-14 18:16:38 +00:00
yuv4mpeg.h Mark files that were imported from the MJPEG Tools suite as such. 2008-05-14 18:16:38 +00:00