Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

changed, split libamplayer includes into amcodec and amplayer to make…

… sync with upstream easier
  • Loading branch information...
commit a43466346b01e87e08bcc77f6769b6b8ec9295ec 1 parent 9cdba48
@davilla davilla authored
Showing with 13 additions and 9 deletions.
  1. +2 −2 configure.in
  2. +4 −2 tools/depends/target/libamplayer/Makefile
  3. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/amports/aformat.h
  4. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/amports/amstream.h
  5. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/amports/vformat.h
  6. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec.h
  7. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec_error.h
  8. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec_msg.h
  9. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amcodec}/codec_type.h
  10. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/log_print.h
  11. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/message.h
  12. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player.h
  13. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_error.h
  14. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_id.h
  15. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_set_sys.h
  16. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_thumbnail.h
  17. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/player_type.h
  18. 0  tools/depends/target/libamplayer/libamplayer/include/{ → amplayer}/stream_format.h
  19. +2 −2 xbmc/cores/amlplayer/DllLibamplayer.h
  20. +2 −1  xbmc/cores/amlplayer/Makefile.in
  21. +1 −1  xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
  22. +2 −1  xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
View
4 configure.in
@@ -1827,7 +1827,7 @@ AC_DEFINE(YAJL_MAJOR, 1, [yajl version 1])
# additional internal players
case $add_players in
*amlplayer*)
- AC_CHECK_HEADER([amlplayer/amports/amstream.h],, AC_MSG_ERROR($missing_headers))
+ AC_CHECK_HEADER([amplayer/player_error.h],, AC_MSG_ERROR($missing_headers))
XB_ADD_PLAYER([AMLPLAYER], [amlplayer])
;;
*omxplayer*)
@@ -1838,7 +1838,7 @@ esac
# additional internal codecs
case $add_codecs in
*amcodec*)
- AC_CHECK_HEADER([amlplayer/codec_error.h],, AC_MSG_ERROR($missing_headers))
+ AC_CHECK_HEADER([amcodec/codec_error.h],, AC_MSG_ERROR($missing_headers))
XB_ADD_CODEC([LIBAMCODEC], [amcodec])
;;
*libstagefright*)
View
6 tools/depends/target/libamplayer/Makefile
@@ -4,8 +4,10 @@ DEPS= ../../Makefile.include Makefile
all: .installed-$(PLATFORM)
.installed-$(PLATFORM): $(DEPS)
- mkdir -p $(PREFIX)/include/amlplayer
- cp -rf libamplayer/include/* $(PREFIX)/include/amlplayer
+ mkdir -p $(PREFIX)/include/amcodec
+ cp -rf libamplayer/include/amcodec/* $(PREFIX)/include/amcodec/
+ mkdir -p $(PREFIX)/include/amplayer
+ cp -rf libamplayer/include/amplayer/* $(PREFIX)/include/amplayer/
touch $@
clean:
View
0  ...libamplayer/libamplayer/include/amports/aformat.h → ...yer/libamplayer/include/amcodec/amports/aformat.h
File renamed without changes
View
0  ...ibamplayer/libamplayer/include/amports/amstream.h → ...er/libamplayer/include/amcodec/amports/amstream.h
File renamed without changes
View
0  ...libamplayer/libamplayer/include/amports/vformat.h → ...yer/libamplayer/include/amcodec/amports/vformat.h
File renamed without changes
View
0  ...ds/target/libamplayer/libamplayer/include/codec.h → ...t/libamplayer/libamplayer/include/amcodec/codec.h
File renamed without changes
View
0  ...get/libamplayer/libamplayer/include/codec_error.h → ...mplayer/libamplayer/include/amcodec/codec_error.h
File renamed without changes
View
0  ...arget/libamplayer/libamplayer/include/codec_msg.h → ...bamplayer/libamplayer/include/amcodec/codec_msg.h
File renamed without changes
View
0  ...rget/libamplayer/libamplayer/include/codec_type.h → ...amplayer/libamplayer/include/amcodec/codec_type.h
File renamed without changes
View
0  ...arget/libamplayer/libamplayer/include/log_print.h → ...amplayer/libamplayer/include/amplayer/log_print.h
File renamed without changes
View
0  .../target/libamplayer/libamplayer/include/message.h → ...ibamplayer/libamplayer/include/amplayer/message.h
File renamed without changes
View
0  ...s/target/libamplayer/libamplayer/include/player.h → ...libamplayer/libamplayer/include/amplayer/player.h
File renamed without changes
View
0  ...et/libamplayer/libamplayer/include/player_error.h → ...layer/libamplayer/include/amplayer/player_error.h
File renamed without changes
View
0  ...arget/libamplayer/libamplayer/include/player_id.h → ...amplayer/libamplayer/include/amplayer/player_id.h
File renamed without changes
View
0  .../libamplayer/libamplayer/include/player_set_sys.h → ...yer/libamplayer/include/amplayer/player_set_sys.h
File renamed without changes
View
0  ...ibamplayer/libamplayer/include/player_thumbnail.h → ...r/libamplayer/include/amplayer/player_thumbnail.h
File renamed without changes
View
0  ...get/libamplayer/libamplayer/include/player_type.h → ...player/libamplayer/include/amplayer/player_type.h
File renamed without changes
View
0  ...t/libamplayer/libamplayer/include/stream_format.h → ...ayer/libamplayer/include/amplayer/stream_format.h
File renamed without changes
View
4 xbmc/cores/amlplayer/DllLibamplayer.h
@@ -36,8 +36,8 @@ extern "C"
#define HAS_AMLPLAYER_VIDEO_STREAMS10
#endif
-#include <player_type.h>
-#include <player_error.h>
+#include <amplayer/player_type.h>
+#include <amplayer/player_error.h>
}
struct AML_URLProtocol;
View
3  xbmc/cores/amlplayer/Makefile.in
@@ -1,6 +1,7 @@
.PHONY: compile
-INCLUDES += -I$(prefix)/include/amlplayer
+INCLUDES += -I$(prefix)/include/amcodec
+INCLUDES += -I$(prefix)/include/amplayer
SRCS = AMLPlayer.cpp
SRCS+= FileURLProtocol.cpp
View
2  xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp
@@ -44,7 +44,7 @@
// amcodec include
extern "C" {
-#include <codec.h>
+#include <amcodec/codec.h>
} // extern "C"
class DllLibamCodecInterface
View
3  xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
@@ -37,7 +37,8 @@ endif
ifeq (@USE_LIBAMCODEC@,1)
SRCS += AMLCodec.cpp
SRCS += DVDVideoCodecAmlogic.cpp
-INCLUDES += -I$(prefix)/include/amlplayer
+INCLUDES += -I$(prefix)/include/amcodec
+INCLUDES += -I$(prefix)/include/amplayer
endif
LIB=Video.a
Please sign in to comment.
Something went wrong with that request. Please try again.