diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
| commit | 8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch) | |
| tree | e1c4465768635d77954b5fd21ae726444ee4f48a /libmpdemux/demux_ty.c | |
| parent | aebdf4f153438497b9310bd1417b5216f07e043b (diff) | |
| parent | afecdb681bed81b5df0ed18a300c68be603dfdf9 (diff) | |
| download | mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2 mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
mplayer.c
screenshot.c
Diffstat (limited to 'libmpdemux/demux_ty.c')
| -rw-r--r-- | libmpdemux/demux_ty.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index f81ea3d57b..7664eddc98 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -35,6 +35,9 @@ #include <time.h> #include <stdarg.h> +#include <libavutil/avstring.h> +#include <libavutil/intreadwrite.h> + #include "config.h" #include "mp_msg.h" @@ -47,8 +50,6 @@ #include "parse_es.h" #include "stheader.h" #include "sub/sub_cc.h" -#include "libavutil/avstring.h" -#include "ffmpeg_files/intreadwrite.h" extern int sub_justify; |