diff options
| -rw-r--r-- | RELEASE | 2 | ||||
| -rw-r--r-- | ffprobe.c | 6 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 | ||||
| -rw-r--r-- | libavutil/x86/x86inc.asm | 2 | ||||
| -rw-r--r-- | libswscale/swscale.c | 2 | ||||
| -rw-r--r-- | tools/build_libstagefright | 12 |
6 files changed, 11 insertions, 15 deletions
@@ -1 +1 @@ -0.9.0.git +0.9.1.git @@ -423,11 +423,7 @@ static inline char *upcase_string(char *dst, size_t dst_size, const char *src) { int i; for (i = 0; src[i] && i < dst_size-1; i++) - if (src[i] >= 'a' && src[i] <= 'z') { - dst[i] = src[i]-32; - } else { - dst[i] = src[i]; - } + dst[i] = av_toupper(src[i]); dst[i] = 0; return dst; } diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index ebe7af5..458d132 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -730,7 +730,7 @@ static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int nb_components, int p for(i=0; i<3; i++) top[i] = left[i]= topleft[i]= 1 << (s->bits - 1); } - if (mb_y == resync_mb_y || mb_y == resync_mb_y+1 && mb_x < resync_mb_x) + if (mb_y == resync_mb_y || mb_y == resync_mb_y+1 && mb_x < resync_mb_x || !mb_x) modified_predictor = 1; for (i=0;i<nb_components;i++) { diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index a28c606..6739870 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -936,8 +936,6 @@ AVX_INSTR movlhps, 1, 0, 0 AVX_INSTR movsd, 1, 0, 0 AVX_INSTR movss, 1, 0, 0 AVX_INSTR mpsadbw, 0, 1, 0 -AVX_INSTR movhlps, 1, 0, 0 -AVX_INSTR movlhps, 1, 0, 0 AVX_INSTR mulpd, 1, 0, 1 AVX_INSTR mulps, 1, 0, 1 AVX_INSTR mulsd, 1, 0, 1 diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 3cb9bfd..1bf52f2 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -990,7 +990,7 @@ YUV2PACKED16WRAPPER(yuv2, rgb48, bgr48le, PIX_FMT_BGR48LE) * correct RGB values into the destination buffer. */ static av_always_inline void -yuv2rgb_write(uint8_t *_dest, int i, unsigned Y1, unsigned Y2, +yuv2rgb_write(uint8_t *_dest, int i, int Y1, int Y2, unsigned A1, unsigned A2, const void *_r, const void *_g, const void *_b, int y, enum PixelFormat target, int hasAlpha) diff --git a/tools/build_libstagefright b/tools/build_libstagefright index ada8d4e..78c2084 100644 --- a/tools/build_libstagefright +++ b/tools/build_libstagefright @@ -6,15 +6,17 @@ if [ "$NDK" = "" ]; then fi echo "Fetching Android system headers" -git clone --depth=1 git://github.com/CyanogenMod/android_frameworks_base.git ../android-source/frameworks/base -git clone --depth=1 git://github.com/CyanogenMod/android_system_core.git ../android-source/system/core +git clone --depth=1 --branch gingerbread-release git://github.com/CyanogenMod/android_frameworks_base.git ../android-source/frameworks/base +git clone --depth=1 --branch gingerbread-release git://github.com/CyanogenMod/android_system_core.git ../android-source/system/core echo "Fetching Android libraries for linking" # Libraries from any froyo/gingerbread device/emulator should work # fine, since the symbols used should be available on most of them. -if [ ! -f "../update-cm-7.0.3-N1-signed.zip" ]; then - wget http://download.cyanogenmod.com/get/update-cm-7.0.3-N1-signed.zip -P../ - unzip update-cm-7.0.3-N1-signed.zip system/lib/* -d../ +if [ ! -d "../android-libs" ]; then + if [ ! -f "../update-cm-7.0.3-N1-signed.zip" ]; then + wget http://download.cyanogenmod.com/get/update-cm-7.0.3-N1-signed.zip -P../ + fi + unzip ../update-cm-7.0.3-N1-signed.zip system/lib/* -d../ mv ../system/lib ../android-libs rmdir ../system fi |
