← Back to branch summary

~ubuntu-branches/ubuntu/lucid/chromium-codecs-ffmpeg/lucid

« back to all changes in this revision

Viewing changes to patches/to_upstream/06_respect_flac_dirac_configure.patch

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin
  • Date: 2010-03-27 13:03:29 UTC
  • Revision ID: james.westby@ubuntu.com-20100327130329-ic9q2nf2kuj3lgyr
Tags: upstream-0.5+svn20100326r42726+42573+42890
Import upstream version 0.5+svn20100326r42726+42573+42890

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/to_upstream/06_respect_flac_dirac_configure.patch
 
1
Only in unpatched_ffmpeg-mt: ffmpeg-mt
 
2
diff -rpu unpatched_ffmpeg-mt/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
 
3
--- unpatched_ffmpeg-mt/libavcodec/Makefile     2010-03-11 17:46:30 -0800
 
4
+++ ffmpeg-mt/libavcodec/Makefile       2010-03-11 19:12:33 -0800
 
5
@@ -493,8 +493,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER)          +
 
6
 OBJS-$(CONFIG_MOV_DEMUXER)             += mpeg4audio.o mpegaudiodata.o
 
7
 OBJS-$(CONFIG_MPEGTS_MUXER)            += mpegvideo.o
 
8
 OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
 
9
-OBJS-$(CONFIG_OGG_DEMUXER)             += flacdec.o flacdata.o flac.o \
 
10
-                                          dirac.o mpeg12data.o
 
11
+OBJS-$(CONFIG_OGG_DEMUXER)             += dirac.o mpeg12data.o
 
12
 OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flacdec.o flacdata.o flac.o
 
13
 OBJS-$(CONFIG_RTP_MUXER)               += mpegvideo.o
 
14
 
 
15
diff -rpu unpatched_ffmpeg-mt/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c
 
16
--- unpatched_ffmpeg-mt/libavformat/oggdec.c    2010-03-11 17:46:31 -0800
 
17
+++ ffmpeg-mt/libavformat/oggdec.c      2010-03-11 19:12:33 -0800
 
18
@@ -38,13 +38,23 @@
 
19
 #define DECODER_BUFFER_SIZE MAX_PAGE_SIZE
 
20
 
 
21
 static const struct ogg_codec * const ogg_codecs[] = {
 
22
+#if CONFIG_DIRAC_DEMUXER
 
23
     &ff_dirac_codec,
 
24
+#endif
 
25
+#if CONFIG_LIBSPEEX
 
26
     &ff_speex_codec,
 
27
+#endif
 
28
     &ff_vorbis_codec,
 
29
     &ff_theora_codec,
 
30
+#if CONFIG_FLAC_DECODER
 
31
     &ff_flac_codec,
 
32
+#endif
 
33
+#if CONFIG_DIRAC_DEMUXER
 
34
     &ff_old_dirac_codec,
 
35
+#endif
 
36
+#if CONFIG_FLAC_DECODER
 
37
     &ff_old_flac_codec,
 
38
+#endif
 
39
     &ff_ogm_video_codec,
 
40
     &ff_ogm_audio_codec,
 
41
     &ff_ogm_text_codec,