aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg/libavcodec/vorbis_data.c
diff options
context:
space:
mode:
authorFlyingRat <flyingrat@outlook.com>2013-04-07 16:36:04 +0200
committerFlyingRat <flyingrat@outlook.com>2013-04-07 16:36:04 +0200
commit0e63a815aa6af63a21848e04b683d3f506dd41b1 (patch)
tree002f61d8a5b1d294d99fd4ba5b6982d76a612f0c /lib/ffmpeg/libavcodec/vorbis_data.c
parent71862137c5337fc678681a23bfbc65f4db7a7b2f (diff)
[FFmpeg] version bump to n1.2 (rev e820e3a) - lib/ffmpeg
This commit now contains the original patches sub directory: patches - Org dir that contains applied xbmc custom patches. patches/README-patches - New README file with info about xbmc patches. patches/obsolete-patches - New dir with obsolete xbmc patches.
Diffstat (limited to 'lib/ffmpeg/libavcodec/vorbis_data.c')
-rw-r--r--lib/ffmpeg/libavcodec/vorbis_data.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ffmpeg/libavcodec/vorbis_data.c b/lib/ffmpeg/libavcodec/vorbis_data.c
index aab06b7453..063a075ce0 100644
--- a/lib/ffmpeg/libavcodec/vorbis_data.c
+++ b/lib/ffmpeg/libavcodec/vorbis_data.c
@@ -18,9 +18,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/mem.h"
#include "vorbis.h"
-#include "libavutil/audioconvert.h"
const uint8_t ff_vorbis_channel_layout_offsets[8][8] = {
{ 0 },