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 /stream | |
| 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 'stream')
| -rw-r--r-- | stream/tv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/tv.c b/stream/tv.c index 64d7b4413e..07fb0270a6 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -233,7 +233,7 @@ static int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds) len = tvh->functions->get_audio_framesize(tvh->priv); dp=new_demux_packet(len); - dp->flags|=1; /* Keyframe */ + dp->keyframe = true; dp->pts=tvh->functions->grab_audio_frame(tvh->priv, dp->buffer,len); ds_add_packet(demux->audio,dp); } @@ -245,7 +245,7 @@ static int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds) { len = tvh->functions->get_video_framesize(tvh->priv); dp=new_demux_packet(len); - dp->flags|=1; /* Keyframe */ + dp->keyframe = true; dp->pts=tvh->functions->grab_video_frame(tvh->priv, dp->buffer, len); ds_add_packet(demux->video,dp); } |