12 files changed, 22 insertions, 20 deletions
diff --git a/libhb/deblock.c b/libhb/deblock.c
index f549fbbb5..261b0b301 100644
--- a/libhb/deblock.c
+++ b/libhb/deblock.c
@@ -17,7 +17,7 @@
 */
 
 #include "hb.h"
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 
 #define PP7_QP_DEFAULT    5
diff --git a/libhb/decmpeg2.c b/libhb/decmpeg2.c
index eae00919c..83c36f698 100644
--- a/libhb/decmpeg2.c
+++ b/libhb/decmpeg2.c
@@ -5,10 +5,8 @@
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
-
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
-#include "libavcodec/avcodec.h"
-#include "libswscale/swscale.h"
 
 /* Cadence tracking */
 #ifndef PIC_FLAG_REPEAT_FIRST_FIELD
diff --git a/libhb/decomb.c b/libhb/decomb.c
index 4fb573045..4c0f42c17 100644
--- a/libhb/decomb.c
+++ b/libhb/decomb.c
@@ -6,7 +6,7 @@
    
    The yadif algorithm was created by Michael Niedermayer. */
 #include "hb.h"
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 
 #define SUPPRESS_AV_LOG
diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c
index b7d672ad3..78856dd13 100644
--- a/libhb/deinterlace.c
+++ b/libhb/deinterlace.c
@@ -17,7 +17,7 @@
 */
 
 #include "hb.h"
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 
 #define SUPPRESS_AV_LOG
diff --git a/libhb/denoise.c b/libhb/denoise.c
index 39139124e..26e2535a5 100644
--- a/libhb/denoise.c
+++ b/libhb/denoise.c
@@ -17,7 +17,7 @@
 */
 
 #include "hb.h"
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 
 #define HQDN3D_SPATIAL_LUMA_DEFAULT    4.0f
diff --git a/libhb/detelecine.c b/libhb/detelecine.c
index 92d279d6f..5262b6132 100644
--- a/libhb/detelecine.c
+++ b/libhb/detelecine.c
@@ -1,5 +1,5 @@
 #include "hb.h"
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 #include "mpeg2dec/mpeg2.h"
 
 /*
diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index 5cf8c5072..b0cf04e2f 100644
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -5,8 +5,7 @@
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
-
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/hb.c b/libhb/hb.c
index 72eb2b030..6c0aabc7a 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -1,8 +1,5 @@
 #include "hb.h"
-
-#include "libavcodec/avcodec.h"
-#include "libavformat/avformat.h"
-#include "libswscale/swscale.h"
+#include "hbffmpeg.h"
 
 struct hb_handle_s
 {
diff --git a/libhb/hbffmpeg.h b/libhb/hbffmpeg.h
new file mode 100644
index 000000000..e0a7634d3
--- /dev/null
+++ b/libhb/hbffmpeg.h
@@ -0,0 +1,11 @@
+/* This file is part of the HandBrake source code.
+   Homepage: <http://handbrake.fr/>.
+   It may be used under the terms of the GNU General Public License. */
+
+#include "libavcodec/avcodec.h"
+#include "libavformat/avformat.h"
+#include "libswscale/swscale.h"
+
+void hb_avcodec_init(void);
+int hb_avcodec_open( AVCodecContext *, struct AVCodec * );
+int hb_avcodec_close( AVCodecContext * );
diff --git a/libhb/muxavi.c b/libhb/muxavi.c
index 99604335d..70d22f522 100644
--- a/libhb/muxavi.c
+++ b/libhb/muxavi.c
@@ -5,7 +5,7 @@
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
-#include "libavcodec/avcodec.h"
+#include "hbffmpeg.h"
 
 #define AVIF_HASINDEX  0x10
 #define AVIIF_KEYFRAME 0x10
diff --git a/libhb/render.c b/libhb/render.c
index 5ca6a4c8d..3dd239dae 100644
--- a/libhb/render.c
+++ b/libhb/render.c
@@ -5,9 +5,7 @@
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
-
-#include "libavcodec/avcodec.h"
-#include "libswscale/swscale.h"
+#include "hbffmpeg.h"
 
 struct hb_work_private_s
 {
diff --git a/libhb/sync.c b/libhb/sync.c
index 411c65610..c391945b0 100644
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -5,10 +5,9 @@
    It may be used under the terms of the GNU General Public License. */
 
 #include "hb.h"
+#include "hbffmpeg.h"
 #include <stdio.h>
-
 #include "samplerate.h"
-#include "libavcodec/avcodec.h"
 
 #ifdef INT64_MIN
 #undef INT64_MIN /* Because it isn't defined correctly in Zeta */