diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-05-01 08:18:50 +0300 |
| commit | bec3b84f5ef798ab843028dd62018571a50330ed (patch) | |
| tree | a1805e73289111518e6343d255da1085736cb7f1 /libmpdemux | |
| parent | 9d27862072a233b423d4a81e966b1ba9627724a6 (diff) | |
| parent | 19c9e0aceb9620c862cab91b509df91931821d66 (diff) | |
| download | mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.bz2 mpv-bec3b84f5ef798ab843028dd62018571a50330ed.tar.xz | |
Merge svn changes up to r26624
Conflicts:
Makefile
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer.c | 2 | ||||
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 1 | ||||
| -rw-r--r-- | libmpdemux/muxer_mpeg.c | 1 | ||||
| -rw-r--r-- | libmpdemux/muxer_rawvideo.c | 2 |
4 files changed, 0 insertions, 6 deletions
diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index a5ab94e2d5..4c4e5a18cf 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -6,8 +6,6 @@ #include <unistd.h> #include "config.h" -#include "version.h" - #include "aviheader.h" #include "ms_hdr.h" diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index cd52168cdc..f1cd641d13 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -5,7 +5,6 @@ #include <inttypes.h> #include <limits.h> #include "config.h" -#include "version.h" #include "mp_msg.h" #include "help_mp.h" diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index c32262359c..f5367e515b 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -6,7 +6,6 @@ #include <sys/types.h> #include "config.h" -#include "version.h" #include "mp_msg.h" #include "help_mp.h" diff --git a/libmpdemux/muxer_rawvideo.c b/libmpdemux/muxer_rawvideo.c index 4600752b89..b5c25aff0a 100644 --- a/libmpdemux/muxer_rawvideo.c +++ b/libmpdemux/muxer_rawvideo.c @@ -6,8 +6,6 @@ #include <unistd.h> #include "config.h" -#include "version.h" - //#include "stream/stream.h" //#include "demuxer.h" //#include "stheader.h" |