Resolve conflict with harfbuzz include file hb.h

Rename hb.h to handbrake.h

diff --git a/gtk/src/audiohandler.c b/gtk/src/audiohandler.c
index 5863f51187e97a5c9cd42ff8508d66250bcbef6c..e922d40f740c53d6258399982a7ece477e9c0f1e 100644 (file)
--- a/gtk/src/audiohandler.c
+++ b/gtk/src/audiohandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 67453cce5b9f8d1e52f90fa0273c8b3f20c2d7c0..b8c41321ece466a2d579fb1c60b1b4c50da478fe 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -74,7 +74,7 @@
 #include <dbt.h>
 #endif
 
-#include "hb.h"
+#include "handbrake.h"
 #include "callbacks.h"
 #include "chapters.h"
 #include "queuehandler.h"

diff --git a/gtk/src/callbacks.h b/gtk/src/callbacks.h
index 39e570eac0e4adad45e21ada1352c538f8571172..94f64bb742a3e211cf7672a4fec9f9e61faac09a 100644 (file)
--- a/gtk/src/callbacks.h
+++ b/gtk/src/callbacks.h
@@ -30,7 +30,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "values.h"
 #include "settings.h"
 

diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index e54b8964f6eee4fcde4e890fbd6b66b5f5dc8621..260f09034a22e435534b5843f96f60066e885a84 100644 (file)
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -25,7 +25,7 @@
 #include <limits.h>
 #include <ctype.h>
 #include <math.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "ghbcompat.h"
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>

diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index bd9aabd1600bddc45a17af4955ea19e2b1900135..37d21c14a2486399c34ac46b1738e09a551532b5 100644 (file)
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -26,7 +26,7 @@
 
 #include "values.h"
 #include "settings.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 
 enum

diff --git a/gtk/src/main.c b/gtk/src/main.c
index f0ca67a3ba297b130c88304bd57bca933688a897..7b59bc4608d326d0a70aea28999e4c2f5ae7e8d9 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -47,7 +47,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "renderer_button.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"

diff --git a/gtk/src/presets.c b/gtk/src/presets.c
index 74cff997f2ea6c97a8ca500f36277a362a2c7fbd..f06f4552d96ad21a8ab2150a86f13ab2187a3a5d 100644 (file)
--- a/gtk/src/presets.c
+++ b/gtk/src/presets.c
@@ -31,7 +31,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "callbacks.h"
 #include "audiohandler.h"

diff --git a/gtk/src/presets.h b/gtk/src/presets.h
index 1f12ea7901196b349f0f0f9b4e57008e6250e1ed..32011e4e2a1268889c1008179ca872f06c8a19f8 100644 (file)
--- a/gtk/src/presets.h
+++ b/gtk/src/presets.h
@@ -24,7 +24,7 @@
 #if !defined(_GHB_PRESETS_H_)
 #define _GHB_PRESETS_H_
 
-#include "hb.h"
+#include "handbrake.h"
 #include "values.h"
 
 void ghb_presets_load(signal_user_data_t *ud);

diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 3272d478795902d03211faae9a9530943d36dd09..7ae9563550d14d0b8234adc7b3dc34923da1de17 100644 (file)
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -43,7 +43,7 @@
 #include "preview.h"
 #include "values.h"
 #include "queuehandler.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #define PREVIEW_STATE_IMAGE 0
 #define PREVIEW_STATE_LIVE 1

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 9ba93c9b7b5c1a10bccfaaffa3338ee840321019..efc8292db77c617ebaa15afe27cd3fb1063043a3 100644 (file)
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -26,7 +26,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"

diff --git a/gtk/src/subtitlehandler.c b/gtk/src/subtitlehandler.c
index fea0f017587000564475e7545d23f8d377d414ed..5e31f684f6c720a4c5595d76a313051be7cd3c32 100644 (file)
--- a/gtk/src/subtitlehandler.c
+++ b/gtk/src/subtitlehandler.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n.h>
 #include "ghbcompat.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "settings.h"
 #include "jobdict.h"
 #include "titledict.h"

diff --git a/libhb/batch.c b/libhb/batch.c
index 02c79893a2517aa7aad0f37152dd28d5016edc6d..ca61d39321e60eea08420bd0743d38bb3e3e239f 100644 (file)
--- a/libhb/batch.c
+++ b/libhb/batch.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 
 struct hb_batch_s

diff --git a/libhb/bd.c b/libhb/bd.c
index 46ffae3d457e2cd62e45e75431cfad10345c793d..ba230d98fc5d893885c6b4abd55a9b448ad3cb9d 100644 (file)
--- a/libhb/bd.c
+++ b/libhb/bd.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "hbffmpeg.h"
 

diff --git a/libhb/chroma_smooth.c b/libhb/chroma_smooth.c
index 4b4938891b26d63c7bdba55486d31cd3007f82fe..0cbfbeea10d289f6cdb8e7762ceb27bd196fcd9b 100644 (file)
--- a/libhb/chroma_smooth.c
+++ b/libhb/chroma_smooth.c
@@ -8,7 +8,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define CHROMA_SMOOTH_STRENGTH_DEFAULT 0.25
 #define CHROMA_SMOOTH_SIZE_DEFAULT 7

diff --git a/libhb/comb_detect.c b/libhb/comb_detect.c
index 4ab53057e38a483a3e1927a6acdd0e639bdcc82a..6bd9223982e2d928510b9619b1a9d3710a2f9429 100644 (file)
--- a/libhb/comb_detect.c
+++ b/libhb/comb_detect.c
@@ -28,7 +28,7 @@ Original "Faster" settings:
 #define FILTER_CLASSIC 1
 #define FILTER_ERODE_DILATE 2
 
-#include "hb.h"
+#include "handbrake.h"
 #include "taskset.h"
 
 typedef struct decomb_thread_arg_s {

diff --git a/libhb/common.c b/libhb/common.c
index 58a80972027337200da7ce3c4acffbd62d2019b2..a3edef84a52ba67659178e64e10af077eca46a19 100644 (file)
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include <sys/time.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "x264.h"
 #include "lang.h"
 #include "common.h"

diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
index a99c28d7bfbaa00576e1b94d395dadd83a8b19f6..f705d7035b81dc11dd0119c7ea049736c70c9667 100644 (file)
--- a/libhb/decavcodec.c
+++ b/libhb/decavcodec.c
@@ -38,7 +38,7 @@
     VC1 decoder) can't easily be used by the HB mpeg stream reader.
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "hbavfilter.h"
 #include "libavfilter/avfilter.h"

diff --git a/libhb/deccc608sub.c b/libhb/deccc608sub.c
index f949c68299dec5535ce895c91ae9b097cef42fe8..e0defc7850e6e9e620d5fd6a498c334c6328551b 100644 (file)
--- a/libhb/deccc608sub.c
+++ b/libhb/deccc608sub.c
@@ -13,7 +13,7 @@
  *
  * Note that the SRT sub generation from CC could be useful for mkv subs.
  */
-#include "hb.h"
+#include "handbrake.h"
 #include "deccc608sub.h"
 
 #define SSA_PREAMBLE_LEN 24

diff --git a/libhb/declpcm.c b/libhb/declpcm.c
index 9de01e62d33c373f9e4b1e90ad7ac78fa071c60b..1c322c568602274b443aef9b6e6408ce45070427 100644 (file)
--- a/libhb/declpcm.c
+++ b/libhb/declpcm.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "audio_resample.h"
 

diff --git a/libhb/decomb.c b/libhb/decomb.c
index 6bcd113c0d228ee4ca04fd58527743bc9e236323..13adfd01c6da00ddb6d3f535fdce79b21376e29b 100644 (file)
--- a/libhb/decomb.c
+++ b/libhb/decomb.c
@@ -54,7 +54,7 @@ which will feed EEDI2 interpolations to yadif.
 12-15: EEDI2 will override cubic interpolation
 *****/
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "eedi2.h"
 #include "taskset.h"

diff --git a/libhb/decpgssub.c b/libhb/decpgssub.c
index 176f4c9712fbbebaff7bd4c3ad63cce61eab86be..cafc4cf5c09128cb4df51257915e0a20ee597ed7 100644 (file)
--- a/libhb/decpgssub.c
+++ b/libhb/decpgssub.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 struct hb_work_private_s

diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c
index 6157d69eb50234549ed930cf928b03fe20e30c69..303387c329a00b850f946fe1efad991b6551667b 100644 (file)
--- a/libhb/decsrtsub.c
+++ b/libhb/decsrtsub.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <iconv.h>
 #include <errno.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "colormap.h"
 #include "decsrtsub.h"
 

diff --git a/libhb/decssasub.c b/libhb/decssasub.c
index 9d27fab2e6d0f844ea69d9ce2da28e5f6edd21c9..9729e686325c7c47acf187ffcbf0ac096568ea16 100644 (file)
--- a/libhb/decssasub.c
+++ b/libhb/decssasub.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include "hb.h"
+#include "handbrake.h"
 
 #include <ass/ass.h>
 #include "decssasub.h"

diff --git a/libhb/dectx3gsub.c b/libhb/dectx3gsub.c
index 42cbf333270b886bfd5ad264ffabc1fae972047f..49ea0e9b7cbbb7f8d4da93ff2e957fda4651e219 100644 (file)
--- a/libhb/dectx3gsub.c
+++ b/libhb/dectx3gsub.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "colormap.h"
 
 struct hb_work_private_s

diff --git a/libhb/decutf8sub.c b/libhb/decutf8sub.c
index 003aba6e91309844071361ed742d19e7cbc76241..45f522c22a43cb8398d6d61dce8d9a5ea4f22527 100644 (file)
--- a/libhb/decutf8sub.c
+++ b/libhb/decutf8sub.c
@@ -18,7 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "decsrtsub.h"
 
 struct hb_work_private_s

diff --git a/libhb/decvobsub.c b/libhb/decvobsub.c
index 344b423f3e8f2f3e89d0fc158ca8bebba1ca666f..5e7f347018a178ecbc999ae3c685f088c788f896 100644 (file)
--- a/libhb/decvobsub.c
+++ b/libhb/decvobsub.c
@@ -27,7 +27,7 @@
  *   }
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 struct hb_work_private_s
 {

diff --git a/libhb/demuxmpeg.c b/libhb/demuxmpeg.c
index 0a4122e64d50e815fe53cb8ff86185416376c124..09a9325b074eaaf0882e7964f9010485325b6f87 100644 (file)
--- a/libhb/demuxmpeg.c
+++ b/libhb/demuxmpeg.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 static inline int check_mpeg_scr( hb_psdemux_t *state, int64_t scr, int tol )
 {

diff --git a/libhb/denoise.c b/libhb/denoise.c
index 58c7935c114b989ac1c5b1933c5817112de4763b..0da2bf8af6cbc6a377fb2e864f8c533eafdd7d84 100644 (file)
--- a/libhb/denoise.c
+++ b/libhb/denoise.c
@@ -17,7 +17,7 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 #define HQDN3D_SPATIAL_LUMA_DEFAULT    4.0f

diff --git a/libhb/detelecine.c b/libhb/detelecine.c
index a9abf86012e67db2d645c02185fe48e6fc4efea1..2d2026124e05671478296c1cf55210c4be6cf95e 100644 (file)
--- a/libhb/detelecine.c
+++ b/libhb/detelecine.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 /*

diff --git a/libhb/dvd.c b/libhb/dvd.c
index fa991bf5c1f4f298848514b7127b7b1d690c2a28..9b1c6fca0ec79cac14dce53fa697109d39b8ff5a 100644 (file)
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "dvd.h"
 

diff --git a/libhb/dvdnav.c b/libhb/dvdnav.c
index bd29065686913e5e331b64a1f4e5947dc512bddf..72833fcd4927959a6c0536f04ba94e4df65692df 100644 (file)
--- a/libhb/dvdnav.c
+++ b/libhb/dvdnav.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "dvd.h"
 

diff --git a/libhb/eedi2.c b/libhb/eedi2.c
index 5bc22c4acc368b2f71ae262a9f5d617c4d81cf11..e531ea96aab1d38b534edbb81884abd24f4e4751 100644 (file)
--- a/libhb/eedi2.c
+++ b/libhb/eedi2.c
@@ -10,7 +10,7 @@
    http://web.missouri.edu/~kes25c/
 */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "eedi2.h"
 
 /**

diff --git a/libhb/enc_qsv.c b/libhb/enc_qsv.c
index f7f84cb383c883f1583ceb56dcb2a3a925b2e111..0b4f78a68163fe2b4e4fc80202be54122cbf890d 100644 (file)
--- a/libhb/enc_qsv.c
+++ b/libhb/enc_qsv.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "nal_units.h"
 #include "qsv_common.h"
 #include "qsv_memory.h"

diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
index 8417ac455dd71680126dd06f79ae9e21ef0a89b0..99bf4010b493b15c8401ab53a828187371c9ae92 100644 (file)
--- a/libhb/encavcodec.c
+++ b/libhb/encavcodec.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "hbffmpeg.h"
 #include "h264_common.h"

diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
index a3b5b23632f6ad8574a77413860a164abf081fcb..29117ded61b0bccd048050c6a502a13f53ec8201 100644 (file)
--- a/libhb/encavcodecaudio.c
+++ b/libhb/encavcodecaudio.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 struct hb_work_private_s

diff --git a/libhb/enctheora.c b/libhb/enctheora.c
index 81da203cdc8345e84ed5c24bf159a73fa7ac7ba1..429f8e2fa8b9e3a492ba4ae56d90b8b99943ee0b 100644 (file)
--- a/libhb/enctheora.c
+++ b/libhb/enctheora.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "theora/codec.h"
 #include "theora/theoraenc.h"
 

diff --git a/libhb/encvobsub.c b/libhb/encvobsub.c
index 4d365279f6c793078e6728fe193db406d87eea1a..0650f3501e684550693a9111aee7f81645b0f4ab 100644 (file)
--- a/libhb/encvobsub.c
+++ b/libhb/encvobsub.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
  
-#include "hb.h"
+#include "handbrake.h"
 
 struct hb_work_private_s
 {

diff --git a/libhb/encvorbis.c b/libhb/encvorbis.c
index a9236271dbbb63ba70ef4200c6961463af5b5e63..3d521e3eab2251d934efca9f815e26a953906962 100644 (file)
--- a/libhb/encvorbis.c
+++ b/libhb/encvorbis.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "audio_remap.h"
 
 #include "vorbis/vorbisenc.h"

diff --git a/libhb/encx264.c b/libhb/encx264.c
index e4d8deac201806e36b939d2c4fee6a95a5dedd95..b0f6781bc45456fd07d132b2572d17c12e0de495 100644 (file)
--- a/libhb/encx264.c
+++ b/libhb/encx264.c
@@ -9,7 +9,7 @@
 
 #include <stdarg.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "encx264.h"
 

diff --git a/libhb/encx265.c b/libhb/encx265.c
index 6e196eafd4116564f23706f7ced42233ede20311..39e912737e5f7911131f349b0fdeea544a531792 100644 (file)
--- a/libhb/encx265.c
+++ b/libhb/encx265.c
@@ -11,7 +11,7 @@
 
 #if HB_PROJECT_FEATURE_X265
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "h265_common.h"
 #include "x265.h"

diff --git a/libhb/fifo.c b/libhb/fifo.c
index c52aef17f759431f15f7a375e06fe2975a70771b..1bc89f82359bc7256e3ede2fb0310dbab1b2f5bd 100644 (file)
--- a/libhb/fifo.c
+++ b/libhb/fifo.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #if HB_PROJECT_FEATURE_QSV
 #include "qsv_libav.h"
 #endif

diff --git a/libhb/grayscale.c b/libhb/grayscale.c
index 1afd55e3692773ae4e549a57776a92d26fa161ad..1608f8f453202fed51c8feb4ff3300576da3b806 100644 (file)
--- a/libhb/grayscale.c
+++ b/libhb/grayscale.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "taskset.h"
 

diff --git a/libhb/hb.h b/libhb/handbrake.h
similarity index 99%
rename from libhb/hb.h
rename to libhb/handbrake.h
index 910b74733e97979a7494ca19b8be22ded4e40283..9cf7444762d0daf3b45626e0f55276cbd751cd0e 100644 (file)
--- a/libhb/hb.h
+++ b/libhb/handbrake.h
@@ -1,4 +1,4 @@
-/* hb.h
+/* handbrake.h
 
    Copyright (c) 2003-2019 HandBrake Team
    This file is part of the HandBrake source code

diff --git a/libhb/hb.c b/libhb/hb.c
index 407c2554d6f3cb18a0f70ada76e7507da072fcbe..b44c2679efa4cbc29ea033657aaf9e4254b99a31 100644 (file)
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "encx264.h"
 #include "libavfilter/avfilter.h"

diff --git a/libhb/hb_dict.c b/libhb/hb_dict.c
index 6e075cef07bd8548785ca796ff57531b766fcc94..b9bd5a8d3356c1c086cb6dbbeee9aee952d2a034 100644 (file)
--- a/libhb/hb_dict.c
+++ b/libhb/hb_dict.c
@@ -9,7 +9,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 
 hb_value_type_t hb_value_type(const hb_value_t *value)

diff --git a/libhb/hb_json.c b/libhb/hb_json.c
index ace8e43103147795cb6e98cd312710c5f144cf6a..5fb92b8b8056d9e5514596f49137448bd8f30f17 100644 (file)
--- a/libhb/hb_json.c
+++ b/libhb/hb_json.c
@@ -8,7 +8,7 @@
  */
 
 #include <jansson.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_json.h"
 #include "libavutil/base64.h"
 #include "qsv_common.h"

diff --git a/libhb/hbavfilter.c b/libhb/hbavfilter.c
index 1669dab0b75dbb74cbb497a87a6ea0a5d1de0302..5e050e28f070b69a73d2e91b4a94c9bb8d022e7f 100644 (file)
--- a/libhb/hbavfilter.c
+++ b/libhb/hbavfilter.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersrc.h"

diff --git a/libhb/hbffmpeg.c b/libhb/hbffmpeg.c
index e0168a8cb7eade1a7c06c8eebef31300b92edb42..af0707874becc0c720d988aae1ab78782cc504cb 100644 (file)
--- a/libhb/hbffmpeg.c
+++ b/libhb/hbffmpeg.c
@@ -1,4 +1,4 @@
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 static int get_frame_type(int type)

diff --git a/libhb/lapsharp.c b/libhb/lapsharp.c
index e80a8480b3d734eebca940344ff6a31a55df934d..192b26721f4ee49adc5b374eb42644fdc37f6831 100644 (file)
--- a/libhb/lapsharp.c
+++ b/libhb/lapsharp.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define LAPSHARP_STRENGTH_LUMA_DEFAULT   0.2
 #define LAPSHARP_STRENGTH_CHROMA_DEFAULT 0.2

diff --git a/libhb/mt_frame_filter.c b/libhb/mt_frame_filter.c
index d6afc923be81781f8bc99da1edfef33cb404db03..fd6bf780e9ad0b463e70a2170cd793bbbc2eae04 100644 (file)
--- a/libhb/mt_frame_filter.c
+++ b/libhb/mt_frame_filter.c
@@ -12,7 +12,7 @@
  * operate on each frame independently with no context carried over
  * from one frame to the next. */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "taskset.h"
 
 typedef struct

diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index 4ce4841fef404722f7eed1ef86749f1f208e9f58..1d630ebd25c4d8dc8bb441efc87d48683b4424e6 100644 (file)
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -12,7 +12,7 @@
 #include "libavutil/avstring.h"
 #include "libavutil/intreadwrite.h"
 
-#include "hb.h"
+#include "handbrake.h"
 #include "ssautil.h"
 #include "lang.h"
 

diff --git a/libhb/muxcommon.c b/libhb/muxcommon.c
index 59a1f94578fbdbe30651de55c18c700398870a5e..a16a27a5216aae81e5a0e2d755141f0c142b9ec1 100644 (file)
--- a/libhb/muxcommon.c
+++ b/libhb/muxcommon.c
@@ -6,7 +6,7 @@
    It may be used under the terms of the GNU General Public License v2.
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
-#include "hb.h"
+#include "handbrake.h"
 #include "decssasub.h"
 
 #define MIN_BUFFERING (1024*1024*10)

diff --git a/libhb/nlmeans.c b/libhb/nlmeans.c
index e68e247394024e456739f32131018ca141935d73..d838e057563cec81c1d79596efc5bcfafbde8b56 100644 (file)
--- a/libhb/nlmeans.c
+++ b/libhb/nlmeans.c
@@ -50,7 +50,7 @@
  *        etc...
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "taskset.h"
 #include "nlmeans.h"

diff --git a/libhb/nlmeans_x86.c b/libhb/nlmeans_x86.c
index 4b18fcf8571008f6d4e445b3429ed8a5d297cde8..131b8100793f6a50a583f60fd6832dfaee5387ac 100644 (file)
--- a/libhb/nlmeans_x86.c
+++ b/libhb/nlmeans_x86.c
@@ -8,7 +8,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"     // needed for ARCH_X86
+#include "handbrake.h"     // needed for ARCH_X86
 
 #if defined(ARCH_X86)
 

diff --git a/libhb/nvenc_common.c b/libhb/nvenc_common.c
index 538ea4f391a54e33cae30845e5911963365fb860..fb711b0ed540b757f98d8ddff0a510e8a6f1a6b9 100644 (file)
--- a/libhb/nvenc_common.c
+++ b/libhb/nvenc_common.c
@@ -8,7 +8,7 @@
  */
 
 #include "hbffmpeg.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #if HB_PROJECT_FEATURE_NVENC
 #include <ffnvcodec/nvEncodeAPI.h>

diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c
index 789a49e71f746a277b84754e798ca13e59d2fb19..8d770c2e9e4c1cfcaef4f55932f221f0daea7a13 100644 (file)
--- a/libhb/platform/macosx/encca_aac.c
+++ b/libhb/platform/macosx/encca_aac.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "audio_remap.h"
 #include <AudioToolbox/AudioToolbox.h>
 #include <CoreAudio/CoreAudio.h>

diff --git a/libhb/platform/macosx/vt_common.c b/libhb/platform/macosx/vt_common.c
index 948ae52fdbd35c6539190e1c7896d9ba04776b41..51c0ff97c6e57b6128e81e7230ea592f21a4082d 100644 (file)
--- a/libhb/platform/macosx/vt_common.c
+++ b/libhb/platform/macosx/vt_common.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "vt_common.h"
 
 #include <VideoToolbox/VideoToolbox.h>

diff --git a/libhb/ports.c b/libhb/ports.c
index 0ad98ad533931fee5252715e9e86259ff5c28790..6086aa628d35c18d1bc2571c6279ffac809236eb 100644 (file)
--- a/libhb/ports.c
+++ b/libhb/ports.c
@@ -88,7 +88,7 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "libavutil/cpu.h"
 
 /************************************************************************

diff --git a/libhb/preset.c b/libhb/preset.c
index f82dba7f45c947caa81009b63ec97ee8bd8d5c1e..b592a2bbaa4ba99453ad0e9907bb1848350524b0 100644 (file)
--- a/libhb/preset.c
+++ b/libhb/preset.c
@@ -8,7 +8,7 @@
  */
 
 #include "preset_builtin.h"
-#include "hb.h"
+#include "handbrake.h"
 #include "hb_dict.h"
 #include "plist.h"
 #include "lang.h"

diff --git a/libhb/qsv_common.c b/libhb/qsv_common.c
index b13fcbd96609e035c41501a0cba2c4926599550c..9f7762159520966bc0131dfd6b2413da787b39c7 100644 (file)
--- a/libhb/qsv_common.c
+++ b/libhb/qsv_common.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "ports.h"
 #include "common.h"
 #include "hb_dict.h"
@@ -2279,7 +2279,7 @@ void hb_qsv_force_workarounds()
 #undef FORCE_WORKAROUNDS
 }
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/buffersrc.h"

diff --git a/libhb/qsv_filter.c b/libhb/qsv_filter.c
index a8ad4ef3c338b838e8334475097ee97d2bfc4eb0..b330c78ad809f98e2a419dba78350af295fd8315 100644 (file)
--- a/libhb/qsv_filter.c
+++ b/libhb/qsv_filter.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "qsv_filter.h"
 #include "qsv_libav.h"

diff --git a/libhb/qsv_filter_pp.c b/libhb/qsv_filter_pp.c
index 93c5acd7cdac5d2eedec27bc1f4b1f3db207f61a..ddab314fd5762b1ce3984bb75ad6d6b16888c7a9 100644 (file)
--- a/libhb/qsv_filter_pp.c
+++ b/libhb/qsv_filter_pp.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "qsv_filter_pp.h"
 #include "qsv_filter.h"

diff --git a/libhb/qsv_memory.c b/libhb/qsv_memory.c
index 69ce2426d5e6a7e14995a29931133897dd52f0a1..bb6c91a6c019c5cf96b6923d8cbbe3c70fe85a1d 100644 (file)
--- a/libhb/qsv_memory.c
+++ b/libhb/qsv_memory.c
@@ -30,7 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #if HB_PROJECT_FEATURE_QSV
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "qsv_memory.h"
 

diff --git a/libhb/reader.c b/libhb/reader.c
index c4487a5be783cc109e434c4b821ea7704b206c3b..a0496a8f5bac77663ba5d97fd92dc286cbbb6516 100644 (file)
--- a/libhb/reader.c
+++ b/libhb/reader.c
@@ -6,7 +6,7 @@
    It may be used under the terms of the GNU General Public License v2.
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
-#include "hb.h"
+#include "handbrake.h"
 
 static int  reader_init( hb_work_object_t * w, hb_job_t * job );
 static void reader_close( hb_work_object_t * w );

diff --git a/libhb/rendersub.c b/libhb/rendersub.c
index 3a26005f7e8b28a4c92cdda89acd29e8618cbd7d..a909ce4f2870a38fc07be82902fde640a115d405 100644 (file)
--- a/libhb/rendersub.c
+++ b/libhb/rendersub.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include <ass/ass.h>
 

diff --git a/libhb/scan.c b/libhb/scan.c
index bd314e3dbeee6b20406bc11aef332b9156aa9826..97567c8b38d527f34930b0fd623c9786542384d9 100644 (file)
--- a/libhb/scan.c
+++ b/libhb/scan.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 
 typedef struct

diff --git a/libhb/ssautil.c b/libhb/ssautil.c
index 108b46f89298c96429a4db0e4b397db3af220980..291620dfe6d1bef859e77eec4baec748c914b4b7 100644 (file)
--- a/libhb/ssautil.c
+++ b/libhb/ssautil.c
@@ -8,7 +8,7 @@
  */
 #include <stdio.h>
 #include <ctype.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "ssautil.h"
 
 struct hb_subtitle_style_s

diff --git a/libhb/stream.c b/libhb/stream.c
index b3f8d3076d7dc51c0d076d1da0e6e62ed4a804ab..aaeaf022e4e71169f5f8ff6d7997fdd5fec94638 100644 (file)
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -11,7 +11,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include "lang.h"
 #include "libbluray/bluray.h"

diff --git a/libhb/sync.c b/libhb/sync.c
index 5ff7f1e172c518d13192825f3c203b8615377260..0af052471ebccfd09592fd9aff563a55fc762028 100644 (file)
--- a/libhb/sync.c
+++ b/libhb/sync.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "hbffmpeg.h"
 #include <stdio.h>
 #include "audio_resample.h"

diff --git a/libhb/taskset.c b/libhb/taskset.c
index add7a44788db201e947542b19fc7faf402306855..dc7809995f0c52a1d62b471fa17229b54093a643 100644 (file)
--- a/libhb/taskset.c
+++ b/libhb/taskset.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "ports.h"
 #include "taskset.h"
 

diff --git a/libhb/unsharp.c b/libhb/unsharp.c
index 0206283c408facd38f7138c2b0989f2ae19b8522..f47c6a1bdea56b088c6c45becbd2d508fda42d1e 100644 (file)
--- a/libhb/unsharp.c
+++ b/libhb/unsharp.c
@@ -8,7 +8,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define UNSHARP_STRENGTH_LUMA_DEFAULT 0.25
 #define UNSHARP_SIZE_LUMA_DEFAULT 7

diff --git a/libhb/vce_common.c b/libhb/vce_common.c
index 8223e56713b10ddf435ee21b660f6c50a32ae1ef..da0476a642207716c8bf2040e3ec7fdb92646dd9 100644 (file)
--- a/libhb/vce_common.c
+++ b/libhb/vce_common.c
@@ -13,7 +13,7 @@
 #include "AMF/core/Factory.h"
 #include "AMF/components/VideoEncoderVCE.h"
 #include "AMF/components/VideoEncoderHEVC.h"
-#include "hb.h"
+#include "handbrake.h"
 
 AMF_RESULT check_component_available(const wchar_t *componentID)
 {

diff --git a/libhb/vfr.c b/libhb/vfr.c
index 460f5eb146700d4394a68e71f5467ef2c2254dca..a42a5342e7ab17cda82808b3040e5382e0fc6cd5 100644 (file)
--- a/libhb/vfr.c
+++ b/libhb/vfr.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 
 //#define HB_DEBUG_CFR_DROPS 1
 #define MAX_FRAME_ANALYSIS_DEPTH 10

diff --git a/libhb/work.c b/libhb/work.c
index 2675a073b2e64f82958e2e5d8aa1274f99d608c6..7d096aca540cda199f92719310f2bb38b4193e4c 100644 (file)
--- a/libhb/work.c
+++ b/libhb/work.c
@@ -7,7 +7,7 @@
    For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
  */
 
-#include "hb.h"
+#include "handbrake.h"
 #include "libavformat/avformat.h"
 #include "decomb.h"
 #include "hbavfilter.h"

diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m
index 14ef1afddce0955c6b088d15df5a6a634d1be0a7..0d825ddf6a188a51834469a68ef90800c3ee6704 100644 (file)
--- a/macosx/HBAudio.m
+++ b/macosx/HBAudio.m
@@ -17,7 +17,7 @@
 #import "HBLocalizationUtilities.h"
 #import "HBJob+Private.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 #define NONE_TRACK_INDEX 0
 

diff --git a/macosx/HBAudioDefaults.m b/macosx/HBAudioDefaults.m
index 3041927a1c75244a9aa26b219c77fb6e81c8ac3b..ac05c2b25f9e261ea5dccab62f0857799c311e68 100644 (file)
--- a/macosx/HBAudioDefaults.m
+++ b/macosx/HBAudioDefaults.m
@@ -9,7 +9,7 @@
 #import "HBCodingUtilities.h"
 #import "HBMutablePreset.h"
 
-#import "hb.h"
+#import "handbrake.h"
 #import "lang.h"
 
 @interface HBAudioDefaults ()

diff --git a/macosx/HBAudioTrack.m b/macosx/HBAudioTrack.m
index 52f0bb53ebecdb33f54d06a5b4bbfbe1507809a2..0ac7f619d40302754bec9a46625e634afec7620f 100644 (file)
--- a/macosx/HBAudioTrack.m
+++ b/macosx/HBAudioTrack.m
@@ -9,7 +9,7 @@
 #import "HBJob.h"
 #import "HBCodingUtilities.h"
 #import "HBTitle.h"
-#import "hb.h"
+#import "handbrake.h"
 
 #define DEFAULT_SAMPLERATE 48000
 

diff --git a/macosx/HBAudioTrackPreset.m b/macosx/HBAudioTrackPreset.m
index 5ac0bbef8a7a4eff051fbb921ad65874c9caf5d2..ea286c3f4ef7ac568c86f0cc83eb13457994e95b 100644 (file)
--- a/macosx/HBAudioTrackPreset.m
+++ b/macosx/HBAudioTrackPreset.m
@@ -6,7 +6,7 @@
 
 #import "HBAudioTrackPreset.h"
 #import "HBCodingUtilities.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #define DEFAULT_SAMPLERATE 48000
 

diff --git a/macosx/HBAudioTransformers.m b/macosx/HBAudioTransformers.m
index c282cb13d096d8fbc6b8244dcb9885c84b09fcdc..95cd661161fbe7757dddd9669720d1ac2bccddfa 100644 (file)
--- a/macosx/HBAudioTransformers.m
+++ b/macosx/HBAudioTransformers.m
@@ -6,7 +6,7 @@
 
 #import "HBAudioTransformers.h"
 #import "HBLocalizationUtilities.h"
-#include "hb.h"
+#include "handbrake.h"
 
 #pragma mark - Value Transformers
 

diff --git a/macosx/HBFilters+UIAdditions.m b/macosx/HBFilters+UIAdditions.m
index b5472a42eb3bd58409bf25934bf9107bab3d98c5..d76f25febfb6552a09e44a7c04cb73b342527db2 100644 (file)
--- a/macosx/HBFilters+UIAdditions.m
+++ b/macosx/HBFilters+UIAdditions.m
@@ -7,7 +7,7 @@
 #import "HBFilters+UIAdditions.h"
 #import "HBLocalizationUtilities.h"
 
-#import "hb.h"
+#import "handbrake.h"
 
 /**
  *  Converts a hb_filter_param_t * array to a NSArray of NSString.

diff --git a/macosx/HBFilters.m b/macosx/HBFilters.m
index 08c0a5a2d719e04c238cba5ca215b6caea56e457..d969d82ab215d506d72663f37000a15a3cf3b751 100644 (file)
--- a/macosx/HBFilters.m
+++ b/macosx/HBFilters.m
@@ -10,7 +10,7 @@
 #import "NSDictionary+HBAdditions.h"
 #import "HBMutablePreset.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString * const HBFiltersChangedNotification = @"HBFiltersChangedNotification";
 

diff --git a/macosx/HBImageUtilities.m b/macosx/HBImageUtilities.m
index d5858c60d9751cddc2ffc0776a5c1d2e1b9ad93a..61d1fcfae8e3b09345d991b2e6855716962dea3d 100644 (file)
--- a/macosx/HBImageUtilities.m
+++ b/macosx/HBImageUtilities.m
@@ -6,7 +6,7 @@
 
 #import "HBImageUtilities.h"
 #import <Cocoa/Cocoa.h>
-#include "hb.h"
+#include "handbrake.h"
 
 CGImageRef CreateScaledCGImageFromCGImage(CGImageRef image, CGFloat thumbnailHeight)
 {

diff --git a/macosx/HBJob+HBAdditions.m b/macosx/HBJob+HBAdditions.m
index 9d10c52d674176c1d9430094f3804ad9f75cd961..552b8570eb421df2ba527d3f7db52c5d9013d793 100644 (file)
--- a/macosx/HBJob+HBAdditions.m
+++ b/macosx/HBJob+HBAdditions.m
@@ -6,7 +6,7 @@
 
 #import "HBJob+HBAdditions.h"
 #import "HBPreferencesKeys.h"
-#import "hb.h"
+#import "handbrake.h"
 
 static NSDateFormatter *_timeFormatter = nil;
 static NSDateFormatter *_dateFormatter = nil;

diff --git a/macosx/HBJob+HBJobConversion.h b/macosx/HBJob+HBJobConversion.h
index 58e51e5bcb7b61b2687b7268c5e94389f5bf1a93..fdbca64e48ae964189a910e1bda3580c6ab709c0 100644 (file)
--- a/macosx/HBJob+HBJobConversion.h
+++ b/macosx/HBJob+HBJobConversion.h
@@ -6,7 +6,7 @@
 
 #import <Foundation/Foundation.h>
 #import "HBJob.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @interface HBJob (HBJobConversion)
 

diff --git a/macosx/HBJob+UIAdditions.m b/macosx/HBJob+UIAdditions.m
index fdfddee6a5a5654ec8aa05f2ad418f01c865f302..3ce379eed9c83290749eed620f563209ae4bc996 100644 (file)
--- a/macosx/HBJob+UIAdditions.m
+++ b/macosx/HBJob+UIAdditions.m
@@ -20,7 +20,7 @@
 
 #import "HBLocalizationUtilities.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 // Text Styles
 static NSDictionary            *detailAttr;

diff --git a/macosx/HBJob.m b/macosx/HBJob.m
index bde7ffa2e6a617864f043804d7bd8351243d76ab..5960ee51b38ad33a2aa241ce558fc1a4d4f11ec5 100644 (file)
--- a/macosx/HBJob.m
+++ b/macosx/HBJob.m
@@ -17,7 +17,7 @@
 #import "HBUtilities.h"
 #import "HBSecurityAccessToken.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString *HBContainerChangedNotification = @"HBContainerChangedNotification";
 NSString *HBChaptersChangedNotification  = @"HBChaptersChangedNotification";

diff --git a/macosx/HBPicture+UIAdditions.m b/macosx/HBPicture+UIAdditions.m
index 421abd1a5c1769594940b2076edab5976de51bac..9250d0211d0f0717cb202673ddd8211d94696e81 100644 (file)
--- a/macosx/HBPicture+UIAdditions.m
+++ b/macosx/HBPicture+UIAdditions.m
@@ -8,7 +8,7 @@
 #import "HBTitle.h"
 #import "HBLocalizationUtilities.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 @implementation HBPicture (UIAdditions)
 

diff --git a/macosx/HBPicture.m b/macosx/HBPicture.m
index 6650fd60d1a7262be5b17cfb7ebcaece09cafe4e..6048714d1aab6610e808fd29eae3c490abfc1d29 100644 (file)
--- a/macosx/HBPicture.m
+++ b/macosx/HBPicture.m
@@ -10,7 +10,7 @@
 #import "HBCodingUtilities.h"
 #import "HBMutablePreset.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString * const HBPictureChangedNotification = @"HBPictureChangedNotification";
 

diff --git a/macosx/HBStateFormatter+Private.h b/macosx/HBStateFormatter+Private.h
index ee71b8141af5893a150a062681a07c4413c11d49..e7d2e3624461fc670ce0339b3ad12ca59ccd278c 100644 (file)
--- a/macosx/HBStateFormatter+Private.h
+++ b/macosx/HBStateFormatter+Private.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "HBStateFormatter.h"
-#include "hb.h"
+#include "handbrake.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/macosx/HBStateFormatter.m b/macosx/HBStateFormatter.m
index 876b10d41493dcd255a1975480b3a1154b8f419e..39b69a6b2baa7c856bd32d8c515887f51efc6dd0 100644 (file)
--- a/macosx/HBStateFormatter.m
+++ b/macosx/HBStateFormatter.m
@@ -6,7 +6,7 @@
 
 #import "HBStateFormatter.h"
 #import "HBLocalizationUtilities.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @implementation HBStateFormatter
 

diff --git a/macosx/HBTitle+Private.h b/macosx/HBTitle+Private.h
index b55854e22bff6bd717515f18a01a2edda861778e..7afb7defc0d97629aef7c02c80b6ba6a153b7b73 100644 (file)
--- a/macosx/HBTitle+Private.h
+++ b/macosx/HBTitle+Private.h
@@ -7,7 +7,7 @@
 #import <Foundation/Foundation.h>
 #import "HBTitle.h"
 #import "HBPreset.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @interface HBTitle (Private)
 

diff --git a/macosx/HBVideo+UIAdditions.m b/macosx/HBVideo+UIAdditions.m
index 4db1bb2289a80a009db6b130fa3407eb6f242df4..a2c1b4d3930f5e5f734b2f393d9f1de9cbbda2a5 100644 (file)
--- a/macosx/HBVideo+UIAdditions.m
+++ b/macosx/HBVideo+UIAdditions.m
@@ -8,7 +8,7 @@
 #import "HBJob+Private.h"
 #import "HBLocalizationUtilities.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 @implementation HBVideo (UIAdditions)
 

diff --git a/macosx/HBVideo.m b/macosx/HBVideo.m
index c4fc5f0daf538abdb63e54dc1767cd96238fa6bc..815292157e90b12d49565fd1680a90c3c3852060 100644 (file)
--- a/macosx/HBVideo.m
+++ b/macosx/HBVideo.m
@@ -9,7 +9,7 @@
 #import "HBCodingUtilities.h"
 #import "HBMutablePreset.h"
 
-#include "hb.h"
+#include "handbrake.h"
 
 NSString * const HBVideoChangedNotification = @"HBVideoChangedNotification";
 

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index f025c225f80b134dd3f292b951fb51f208f217b1..f96e2958f0c20689084a872e3629e4a06d1ef12e 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -1861,7 +1861,7 @@
                        );
                        outputPaths = (
                                "$(EXTERNAL_BUILD)/libhb/hb_dict.h",
-                               "$(EXTERNAL_BUILD)/libhb/hb.h",
+                               "$(EXTERNAL_BUILD)/libhb/handbrake.h",
                                "$(EXTERNAL_BUILD)/macosx/Info.plist",
                        );
                        runOnlyForDeploymentPostprocessing = 0;

diff --git a/macosx/HandBrakeKitTests/HBDictTests.m b/macosx/HandBrakeKitTests/HBDictTests.m
index 905426488ee6074a152d21f3f48b958a4034e0de..00a2099d7ad7a7577c45d626e990930db62255bb 100644 (file)
--- a/macosx/HandBrakeKitTests/HBDictTests.m
+++ b/macosx/HandBrakeKitTests/HBDictTests.m
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 #import "NSDictionary+HBAdditions.h"
-#include "hb.h"
+#include "handbrake.h"
 
 @interface HBDictTests : XCTestCase
 

diff --git a/test/parsecsv.c b/test/parsecsv.c
index bf343baa8515248c36997c252572c15a0c523aef..b777d1dab7de100cd98763217b933f047a8455a7 100644 (file)
--- a/test/parsecsv.c
+++ b/test/parsecsv.c
@@ -8,7 +8,7 @@
  */
 
 #include <fcntl.h>
-#include "hb.h"
+#include "handbrake.h"
 #include "parsecsv.h"
 
 /* Internal declarations */

diff --git a/test/test.c b/test/test.c
index 19fdb86ec9ba222acb4aff1a0bd12d16909195b6..c4abe76872445cdc4f6f0652ae82e3c895ff027c 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -30,7 +30,7 @@
 #include <pthread.h>
 #endif
 
-#include "hb.h"
+#include "handbrake.h"
 #include "lang.h"
 #include "parsecsv.h"