mirror of
https://github.com/mpv-player/mpv
synced 2024-12-25 08:12:17 +00:00
51e198c2a1
Conflicts:
.gitignore
bstr.c
cfg-mplayer.h
defaultopts.c
libvo/video_out.c
The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.
In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
22 lines
231 B
Plaintext
22 lines
231 B
Plaintext
*.o
|
|
*.a
|
|
*.d
|
|
.depend
|
|
|
|
/config.h
|
|
/config.mak
|
|
/config.log
|
|
/mplayer
|
|
/version.h
|
|
/codecs.conf.h
|
|
/codec-cfg
|
|
/cpuinfo
|
|
/tags
|
|
/TAGS
|
|
/locale
|
|
/po
|
|
/libvo/vo_gl3_shaders.h
|
|
/libmpdemux/ebml_defs.c
|
|
/libmpdemux/ebml_types.h
|
|
/libvo/vdpau_template.c
|