diff options
| author | Luotao Fu <lfu@pengutronix.de> | 2009-10-06 13:02:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-06 13:02:19 +0200 |
| commit | cfd1f3907f8810a63c5aaece3f4f492046beeaa7 (patch) | |
| tree | 0a5836d07f58da8386f3ff257762900118fe9846 | |
| parent | c278c1d83d5fd498149a0017c5f0e1225b50235f (diff) | |
| download | libfsl-vpu-cfd1f3907f8810a63c5aaece3f4f492046beeaa7.tar.gz libfsl-vpu-cfd1f3907f8810a63c5aaece3f4f492046beeaa7.tar.xz | |
Several fixes
- update automake
- version bump
- fix headers to avoid compile warnings of the gst plugins.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/GNUmakefile.am | 2 | ||||
| -rw-r--r-- | include/vpu_io.h | 3 | ||||
| -rw-r--r-- | include/vpu_lib.h | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 597f0ba..7e3dba1 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([libfsl-vpu], [0.1.0], [bugs@pengutronix.de]) +AC_INIT([libfsl-vpu], [0.2.0], [bugs@pengutronix.de]) AC_CONFIG_HEADERS([include/libfsl-vpu_config.h]) AC_CONFIG_SRCDIR([src/vpu_io.c]) AC_CONFIG_MACRO_DIR([config/m4]) diff --git a/include/GNUmakefile.am b/include/GNUmakefile.am index 71f69f6..c5c8338 100644 --- a/include/GNUmakefile.am +++ b/include/GNUmakefile.am @@ -1,6 +1,6 @@ nobase_include_HEADERS = \ - vpu_io.h vpu_lib.h + vpu_io.h vpu_lib.h vpu_debug.h MAINTAINERCLEANFILES = \ libfsl-vpu_config.h.in \ diff --git a/include/vpu_io.h b/include/vpu_io.h index dbb8e76..ba4e318 100644 --- a/include/vpu_io.h +++ b/include/vpu_io.h @@ -59,4 +59,7 @@ unsigned long VpuReadReg(unsigned long addr); void ResetVpu(void); int isVpuInitialized(void); +int IOSystemInit(void *callback); +int IOSystemShutdown(void); + #endif diff --git a/include/vpu_lib.h b/include/vpu_lib.h index 1e76826..8300312 100644 --- a/include/vpu_lib.h +++ b/include/vpu_lib.h @@ -45,6 +45,8 @@ typedef Uint32 PhysicalAddress; #define PRJ_BODADX7X 0xF009 typedef enum { + STD_MPEG2 = -1, + STD_VC = -1, STD_MPEG4 = 0, STD_H263, STD_AVC @@ -152,7 +154,7 @@ typedef struct { int mp4_shortVideoHeader; int h263_annexJEnable; - int minFrameBufferCount; + unsigned int minFrameBufferCount; int frameBufDelay; int nextDecodedIdxNum; int normalSliceSize; |