You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

35 lines
828 B

  1. From 4ae9873a80ea47858d20f1d590aaf816c3aebb20 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Tue, 10 Mar 2020 20:13:57 -0700
  4. Subject: [PATCH] fix compilation without SBR/PS_DEC
  5. The bits.h include needs to be in mp4.h as it uses the bitfield struct.
  6. ---
  7. libfaad/mp4.c | 1 -
  8. libfaad/mp4.h | 1 +
  9. 2 files changed, 1 insertion(+), 1 deletion(-)
  10. diff --git a/libfaad/mp4.c b/libfaad/mp4.c
  11. index 9f0198a..dbcff83 100644
  12. --- a/libfaad/mp4.c
  13. +++ b/libfaad/mp4.c
  14. @@ -33,7 +33,6 @@
  15. #include <stdlib.h>
  16. -#include "bits.h"
  17. #include "mp4.h"
  18. #include "syntax.h"
  19. diff --git a/libfaad/mp4.h b/libfaad/mp4.h
  20. index 5a94be4..d99a3e3 100644
  21. --- a/libfaad/mp4.h
  22. +++ b/libfaad/mp4.h
  23. @@ -35,6 +35,7 @@
  24. extern "C" {
  25. #endif
  26. +#include "bits.h"
  27. #include "neaacdec.h"
  28. int8_t AudioSpecificConfig2(uint8_t *pBuffer,