diff options
| author | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-16 07:30:30 +0200 |
| commit | 4e89851aa128a614f59ff4885af384a266cb24e6 (patch) | |
| tree | c6ab9f34ef3e9c1d58f8ec837b93e249e79bdcf6 /encode_lavc.h | |
| parent | f45eab6faea05834c1337175dbe51437707b8d7e (diff) | |
| parent | 6557f206efeb4569a42f1e4810172bc97fd64619 (diff) | |
| download | mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.bz2 mpv-4e89851aa128a614f59ff4885af384a266cb24e6.tar.xz | |
Merge branch 'master' into osd_changes
Conflicts:
Makefile
command.c
libvo/gl_common.c
libvo/vo_corevideo.m
libvo/vo_opengl.c
libvo/vo_opengl_old.c
libvo/vo_opengl_shaders.glsl
sub/ass_mp.c
sub/osd_libass.c
sub/sd_ass.c
Diffstat (limited to 'encode_lavc.h')
| -rw-r--r-- | encode_lavc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/encode_lavc.h b/encode_lavc.h index 7c1ca07545..29b35c6335 100644 --- a/encode_lavc.h +++ b/encode_lavc.h @@ -59,8 +59,11 @@ struct encode_lavc_context { struct stream *twopass_bytebuffer_v; unsigned int t0; unsigned int frames; + bool expect_video; bool expect_audio; + bool video_first; + bool audio_first; // has encoding failed? bool failed; |