1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 15:52:25 +00:00
mpv/libmpdemux
wm4 84829a4ea1 Merge branch 'osd_changes' into master
Conflicts:
	DOCS/man/en/options.rst
2012-11-01 02:12:47 +01:00
..
asf.h Change <endian.h> include to <sys/types.h> 2012-07-31 23:37:56 +02: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 options, avi: remove -loadidx/-saveidx 2012-10-30 19:50:21 +01:00
aviheader.h Change <endian.h> include to <sys/types.h> 2012-07-31 23:37:56 +02:00
aviprint.c
aviprint.h
demux_asf.c demux, vd_ffmpeg: fix demux keyframe flag, set AV_PKT_FLAG_KEY 2012-07-25 01:10:30 +03:00
demux_avi.c options: rename -ni to -avi-ni 2012-10-30 19:50:22 +01:00
demux_cue.c core: add new support for reading .cue files 2012-01-18 04:25:19 +01:00
demux_edl.c
demux_gif.c demux_gif: change format of packets to make it work again 2012-08-20 15:36:05 +02:00
demux_lavf.c demux_lavf, ad_ffmpeg: don't change AVCodecContext.block_align 2012-10-30 19:50:24 +01:00
demux_mf.c demux_mf: add j2c and jpc as jpeg2k, add tiff extension as tif image 2012-08-03 01:43:44 +02:00
demux_mkv.c Rename to "mpv" 2012-10-12 10:14:32 +02:00
demux_mng.c vd_ffmpeg, demux_mng: allow general raw formats, fix MNG demuxer 2012-08-20 15:36:04 +02:00
demux_mpg.c libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00
demux_packet.h demux, vd_ffmpeg: fix demux keyframe flag, set AV_PKT_FLAG_KEY 2012-07-25 01:10:30 +03:00
demux_rawaudio.c rawaudio: use mplayer audio format for format option 2012-09-18 21:07:29 +02:00
demux_rawvideo.c
demux_ts.c demux_ts: remove some incorrect usages of realloc_struct 2012-10-31 22:46:40 +01:00
demux_ts.h libmpdemux: add back demux_ts 2012-09-18 21:07:30 +02:00
demuxer.c options: rename -ni to -avi-ni 2012-10-30 19:50:22 +01:00
demuxer.h Merge branch 'osd_changes' into master 2012-11-01 02:12:47 +01:00
ebml.c demux_mkv: fix a hang with invalid files 2012-11-01 02:12:17 +01:00
ebml.h
extension.c libmpdemux: remove demux_real, demux_viv, demux_audio 2012-08-20 15:36:02 +02:00
matroska.h
mf.c windows support: unicode filenames 2012-03-09 20:48:54 +02:00
mf.h
mp3_hdr.c libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00
mp3_hdr.h libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00
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 libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00
mpeg_hdr.h libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00
ms_hdr.h Change <endian.h> include to <sys/types.h> 2012-07-31 23:37:56 +02:00
parse_es.c libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00
parse_es.h libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00
stheader.h demux_lavf: add a hack to work around other hacks 2012-10-30 19:50:24 +01:00
video.c libmpdemux: add back demux_mpg 2012-09-18 21:07:30 +02:00