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 /stream/stream_dvd_common.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 'stream/stream_dvd_common.c')
| -rw-r--r-- | stream/stream_dvd_common.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index b2f3a14fee..db566e5136 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -16,13 +16,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" #include <fcntl.h> #include <inttypes.h> #include <unistd.h> #include <stdio.h> #include <string.h> +#include <libavutil/intreadwrite.h> + +#include "config.h" + #include <dvdread/ifo_types.h> + #ifdef __FreeBSD__ #include <sys/cdrio.h> #endif @@ -37,7 +41,6 @@ #include "mp_msg.h" #include "stream_dvd_common.h" -#include "ffmpeg_files/intreadwrite.h" const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" }; |