diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-06-02 18:55:18 +0300 |
commit | 497c32cdadb9da9bc20a3650b3056e2657358136 (patch) | |
tree | ed3d48e5f9631d2951d8569b48a00d025c20ab08 /cfg-mencoder.h | |
parent | 626373af3840220d40217b7bbe81f5fb452882bb (diff) | |
parent | def243261a0b8e3ab0d043cd89b97f8c9826e573 (diff) | |
download | mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.bz2 mpv-497c32cdadb9da9bc20a3650b3056e2657358136.tar.xz |
Merge svn changes up to r31291
Diffstat (limited to 'cfg-mencoder.h')
-rw-r--r-- | cfg-mencoder.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index e8220d04ad..37ba6c05d6 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -24,6 +24,7 @@ */ #include "libmpcodecs/ve_x264.h" +#include "libmpdemux/demux_ts.h" #include "cfg-common.h" extern int sws_flags; |