diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-29 07:16:09 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-29 10:01:28 +0200 |
| commit | 97ac824124fc5cdfbd9ac74156b79c098bce09c6 (patch) | |
| tree | 2c924403e2fb619ec57ee0933cd12d32ef1bb62a /stream/freesdp | |
| parent | 87f4cafe9c0881743d1117c2e8cd7e3376e33302 (diff) | |
| parent | f64a4e9931428de0f308f6ed0a0144edb8ce9619 (diff) | |
| download | mpv-97ac824124fc5cdfbd9ac74156b79c098bce09c6.tar.bz2 mpv-97ac824124fc5cdfbd9ac74156b79c098bce09c6.tar.xz | |
Merge remote-tracking branch 'origin/master'
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 aadf1002f8a will
be redone in a follow-up commit, as the original commit causes too many
conflicts with the work done locally in this branch, and other work in
progress.
Diffstat (limited to 'stream/freesdp')
0 files changed, 0 insertions, 0 deletions