diff options
author | wm4 <wm4@mplayer2.org> | 2012-07-28 17:07:49 +0200 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-07-28 17:24:05 +0200 |
commit | 51e198c2a1e43b74ad35ef358628dcd8791158d9 (patch) | |
tree | 60f6c2255ed912a7a4866b71728104a2cb2442f1 /libmpdemux/stheader.h | |
parent | 2793e7eb70a342b346788f83e1ed660c8e0d491e (diff) | |
parent | 7dfaaa95104a8e6dc024fddaf1b49c71768f1be7 (diff) | |
download | mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.bz2 mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.xz |
Merge remote-tracking branch 'origin/master'
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 2ba8b91a97e7e8. 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.
Diffstat (limited to 'libmpdemux/stheader.h')
-rw-r--r-- | libmpdemux/stheader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 06f52324e5..58390650b2 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -33,6 +33,7 @@ struct demuxer; struct demux_stream *ds; \ struct codecs *codec; \ unsigned int format; \ + int libav_codec_id; \ int initialized; \ /* number of seconds stream should be delayed \ * (according to dwStart or similar) */ \ @@ -46,6 +47,7 @@ struct demuxer; double pts; \ /* decoder context */ \ void *context; \ + const char *codecname; \ char *lang; /* track language */ \ char *title; /* track title */ \ bool default_track; \ |