diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-26 09:39:09 +0300 |
| commit | 2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b (patch) | |
| tree | a083736322f89e8a0440f52c82c0922fc084798f /libmpdemux/demux_rtp_codec.cpp | |
| parent | 2993acdc3118ec01274cf357336760443bfce561 (diff) | |
| parent | 59f2911c3ec64fcb9db8ac8e1216cf01506cac29 (diff) | |
| download | mpv-2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b.tar.bz2 mpv-2b47fd59ab442ee27db9cfc4e7ebcdba93bab57b.tar.xz | |
Merge svn changes up to r26540
Conflicts:
Makefile
Diffstat (limited to 'libmpdemux/demux_rtp_codec.cpp')
| -rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 7f9174d6a0..33b2dc41eb 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -6,7 +6,7 @@ extern "C" { #include <limits.h> #include <math.h> #include "stheader.h" -#include "base64.h" +#include "libavutil/base64.h" } #ifdef USE_LIBAVCODEC |