mirror of https://github.com/mpv-player/mpv
97ac824124
Conflicts:
bstr.c
bstr.h
libvo/cocoa_common.m
libvo/gl_common.c
libvo/video_out.c
mplayer.c
screenshot.c
sub/subassconvert.c
Merge of cocoa_common.m done by pigoz.
Picking my version of screenshot.c. The fix in commit
|
||
|---|---|---|
| .. | ||
| freesdp | ||
| librtsp | ||
| realrtsp | ||
| ai_alsa1x.c | ||
| ai_oss.c | ||
| asf_mmst_streaming.c | ||
| asf_mmst_streaming.h | ||
| asf_streaming.c | ||
| audio_in.c | ||
| audio_in.h | ||
| cache2.c | ||
| cache2.h | ||
| cdd.h | ||
| cdinfo.c | ||
| cookies.c | ||
| cookies.h | ||
| dvb_tune.c | ||
| dvb_tune.h | ||
| dvbin.h | ||
| frequencies.c | ||
| frequencies.h | ||
| http.c | ||
| http.h | ||
| network.c | ||
| network.h | ||
| open.c | ||
| pnm.c | ||
| pnm.h | ||
| pvr.h | ||
| rtp.c | ||
| rtp.h | ||
| stream.c | ||
| stream.h | ||
| stream_bluray.c | ||
| stream_cdda.c | ||
| stream_cddb.c | ||
| stream_cue.c | ||
| stream_dvb.c | ||
| stream_dvd.c | ||
| stream_dvd.h | ||
| stream_dvd_common.c | ||
| stream_dvd_common.h | ||
| stream_dvdnav.c | ||
| stream_dvdnav.h | ||
| stream_ffmpeg.c | ||
| stream_file.c | ||
| stream_ftp.c | ||
| stream_live555.c | ||
| stream_mf.c | ||
| stream_nemesi.c | ||
| stream_netstream.c | ||
| stream_netstream.h | ||
| stream_null.c | ||
| stream_pvr.c | ||
| stream_radio.c | ||
| stream_radio.h | ||
| stream_rtp.c | ||
| stream_rtsp.c | ||
| stream_smb.c | ||
| stream_tv.c | ||
| stream_udp.c | ||
| stream_vcd.c | ||
| stream_vstream.c | ||
| tcp.c | ||
| tcp.h | ||
| tv.c | ||
| tv.h | ||
| tvi_bsdbt848.c | ||
| tvi_def.h | ||
| tvi_dshow.c | ||
| tvi_dshow.h | ||
| tvi_dummy.c | ||
| tvi_v4l.c | ||
| tvi_v4l2.c | ||
| udp.c | ||
| udp.h | ||
| url.c | ||
| url.h | ||
| vcd_read.h | ||
| vcd_read_darwin.h | ||
| vcd_read_fbsd.h | ||
| vcd_read_win32.h | ||