← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/opencv/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch

  • Committer: Bazaar Package Importer
  • Author(s): Nobuhiro Iwamatsu
  • Date: 2011-07-25 17:06:08 UTC
  • mfrom: (4.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110725170608-o64zguuhm23ab2e5
Tags: 2.1.0-7
http://bugs.debian.org/634818
Fix FTBFS with libav 0.7. (Closes: #634818)
Add patches/vcap_ffmpeg_fix_compile_against_libav0.7.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/cvcap_ffmpeg_fix_compile_against_libav0.7.patch
59
59
+#define AVERROR_IO          AVERROR(EIO)     ///< I/O error
60
60
+#define AVERROR_NOMEM       AVERROR(ENOMEM)  ///< Not enough memory
61
61
+
62
 
+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 2<<8 | 0) */
 
62
+#endif /* LIBAVFORMAT_BUILD >= (53<<16 | 0<<8 | 0) */
63
63
+
64
64
 static const char * icvFFMPEGErrStr(int err)
65
65
 {