summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-08-22 15:24:11 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-08-22 15:24:11 +0000
commite4e4c39e899428857741849a8d23aa1ef0b0b62d (patch)
tree46251ab1cd74b9df01ce05865b3b45a21696d411 /media-video/mplayer/files
parentremoving from metadata (diff)
downloadgentoo-2-e4e4c39e899428857741849a8d23aa1ef0b0b62d.tar.gz
gentoo-2-e4e4c39e899428857741849a8d23aa1ef0b0b62d.tar.bz2
gentoo-2-e4e4c39e899428857741849a8d23aa1ef0b0b62d.zip
add upstream build fix against ffmpeg git master
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'media-video/mplayer/files')
-rw-r--r--media-video/mplayer/files/mplayer-1.1-codecid.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/media-video/mplayer/files/mplayer-1.1-codecid.patch b/media-video/mplayer/files/mplayer-1.1-codecid.patch
new file mode 100644
index 000000000000..38a58aa0f47b
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.1-codecid.patch
@@ -0,0 +1,19 @@
+r35075 | iive | 2012-08-11 12:42:43 -0400 (Sat, 11 Aug 2012) | 4 lines
+
+Quick Build Fix. FFmpeg CodecID is redefined as AVCodecID.
+It needs the FFmpeg includes in all places that use it.
+
+
+Index: libmpdemux/mp_taglists.h
+===================================================================
+--- libmpdemux/mp_taglists.h (revision 35074)
++++ libmpdemux/mp_taglists.h (revision 35075)
+@@ -20,6 +20,8 @@
+ #define MPLAYER_MP_TAGLISTS_H
+
+ #include <stdint.h>
++#include "libavutil/common.h"
++#include "libavformat/avformat.h"
+
+ enum CodecID mp_tag2codec_id(uint32_t tag, int audio);
+ uint32_t mp_codec_id2tag(enum CodecID codec_id, uint32_t old_tag, int audio);