diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
| commit | 1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch) | |
| tree | c5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /mencoder.c | |
| parent | f2864e9a072f53c38a04dd7c44392521777dc908 (diff) | |
| parent | 86c9fb2e8930de031807513c9b93d47394d2d2fa (diff) | |
| download | mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2 mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz | |
Merge svn changes up to r29277
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index af76a90abf..f30ebafb8d 100644 --- a/mencoder.c +++ b/mencoder.c @@ -288,9 +288,7 @@ static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_st #include "cfg-mencoder.h" -#ifdef CONFIG_DVDREAD #include "spudec.h" -#endif #include "vobsub.h" #include "libao2/audio_out.h" |