forked from pool/libquicktime
e93eddf4dc
* remove generated file that got committed somehow * cleanup - remove all the .cvsignore files * remove another .cvsignore file * remove typo * add a bunch more generated files to ignore * more files added * add more files * switch to .gitignore from .cvsignore * remove m4/avcodec.m4, not needed with changes to configure.ac * don't need avcodec.m4 with changes to configure.ac - Remove merged patches: * libquicktime-1.2.4-integer_overflow.patch * libquicktime-1.2.4-multiple_vulnerabilities.patch - Remove all local patches: * libquicktime-faad2.patch * libquicktime-1.2.4-ffmpeg2.patch * libquicktime-1.2.4-ffmpeg29.patch * libquicktime-1.2.4-ffmpeg4.patch - Readd patches to be rebased from the git: * 0001-Fix-sizeof-call-in-faad2.patch * 0002-Allow-any-avcodec-to-be-detected-by-configure.patch * 0003-Fix-AVCODEC_HEADER-macro-replacement.patch * 0004-Ignore-prepared-patches-in-git-checkout.patch * 0005-ffmpeg4-conversion-fixing-the-erroring-ones-only.patch - Switch to Git snapshots as upstream moved to git, use _service - Remove redone patch: * libquicktime-ffmpeg3.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libquicktime?expand=0&rev=84
26 lines
766 B
Diff
26 lines
766 B
Diff
From 51faccd7a1810ba3413d052cecf48834a7edd696 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
|
|
Date: Wed, 13 Jun 2018 11:28:02 +0200
|
|
Subject: [PATCH 3/5] Fix AVCODEC_HEADER macro replacement
|
|
|
|
---
|
|
plugins/ffmpeg/ffmpeg.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/plugins/ffmpeg/ffmpeg.h b/plugins/ffmpeg/ffmpeg.h
|
|
index 346abfc..7bff3d8 100644
|
|
--- a/plugins/ffmpeg/ffmpeg.h
|
|
+++ b/plugins/ffmpeg/ffmpeg.h
|
|
@@ -26,7 +26,7 @@
|
|
#define QUICKTIME_FFMPEG_H
|
|
|
|
#include <quicktime/qtprivate.h>
|
|
-#include AVCODEC_HEADER
|
|
+#include <libavcodec/avcodec.h>
|
|
|
|
void quicktime_init_video_codec_ffmpeg(quicktime_codec_t * codec,
|
|
quicktime_video_map_t *vtrack,
|
|
--
|
|
2.17.1
|
|
|