From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Mon, 26 Aug 2013 20:00:33 +0000 (+0200)
Subject: - compilation fix for ffmpeg-2
X-Git-Tag: auto/th/fuse-utils-1.1.1-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffuse-utils.git;a=commitdiff_plain;h=9a9be085a188711bf5833c44a5e55fe0bc6d6675

- compilation fix for ffmpeg-2
---

diff --git a/ffmpeg_enum_codecid.patch b/ffmpeg_enum_codecid.patch
new file mode 100644
index 0000000..5104dc3
--- /dev/null
+++ b/ffmpeg_enum_codecid.patch
@@ -0,0 +1,29 @@
+--- fuse-utils-1.1.1/fmfconv_ff.c.orig	2013-08-26 21:45:51.749946717 +0200
++++ fuse-utils-1.1.1/fmfconv_ff.c	2013-08-26 21:46:33.397257449 +0200
+@@ -224,7 +224,7 @@
+  */
+ 
+ static int
+-add_audio_stream( enum CodecID codec_id, int freq, int stereo )
++add_audio_stream( enum AVCodecID codec_id, int freq, int stereo )
+ {
+   AVCodecContext *c;
+ 
+@@ -440,7 +440,7 @@
+ 
+ /* add a video output stream */
+ static int
+-add_video_stream( enum CodecID codec_id, int w, int h, int timing )
++add_video_stream( enum AVCodecID codec_id, int w, int h, int timing )
+ {
+   AVCodecContext *c;
+ 
+@@ -674,7 +674,7 @@
+ {
+ 
+   AVCodec *ac, *vc;
+-  enum CodecID acodec, vcodec;
++  enum AVCodecID acodec, vcodec;
+ 
+   ff_picture = NULL;
+   ff_tmp_picture = NULL;