MAINTAINERS: Remove myself as leader

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f2c58931e6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
avcodec/jpeglsdec: check err value for ls_get_code_runterm()
2015-07-31 18:35:42 +02:00 · 2014-01-16 20:54:14 +01:00 · 2014-01-16 20:54:14 +01:00 · 2014-01-16 20:53:57 +01:00 · 2013-12-21 10:00:40 +01:00 · 2013-12-20 22:11:04 +02:00
4 changed files with 15 additions and 10 deletions
--- a/1
+++ b/1
@ -8,7 +8,6 @@ FFmpeg code.
 Project Leader
 ==============

-Michael Niedermayer
  final design decisions


--- a/libavcodec/arm/int_neon.S
+++ b/libavcodec/arm/int_neon.S
@ -67,10 +67,10 @@ function ff_scalarproduct_int16_neon, export=1

 3:      vpadd.s32       d16, d0,   d1
        vpadd.s32       d17, d2,   d3
-        vpadd.s32       d10, d4,   d5
-        vpadd.s32       d11, d6,   d7
+        vpadd.s32       d18, d4,   d5
+        vpadd.s32       d19, d6,   d7
        vpadd.s32       d0,  d16,  d17
-        vpadd.s32       d1,  d10,  d11
+        vpadd.s32       d1,  d18,  d19
        vpadd.s32       d2,  d0,   d1
        vpaddl.s32      d3,  d2
        vmov.32         r0,  d3[0]
@ -107,10 +107,10 @@ function ff_scalarproduct_and_madd_int16_neon, export=1

        vpadd.s32       d16, d0,   d1
        vpadd.s32       d17, d2,   d3
-        vpadd.s32       d10, d4,   d5
-        vpadd.s32       d11, d6,   d7
+        vpadd.s32       d18, d4,   d5
+        vpadd.s32       d19, d6,   d7
        vpadd.s32       d0,  d16,  d17
-        vpadd.s32       d1,  d10,  d11
+        vpadd.s32       d1,  d18,  d19
        vpadd.s32       d2,  d0,   d1
        vpaddl.s32      d3,  d2
        vmov.32         r0,  d3[0]
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@ -143,6 +143,8 @@ static inline int ls_get_code_runterm(GetBitContext *gb, JLSState *state, int RI
        ret = ret >> 1;
    }

+    if(FFABS(ret) > 0xFFFF)
+        return -0x10000;
    /* update state */
    state->A[Q] += FFABS(ret) - RItype;
    ret *= state->twonear;
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@ -271,8 +271,10 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
    if(next == END_NOT_FOUND){
        void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, (*buf_size) + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);

-        if(!new_buffer)
+        if(!new_buffer) {
+            pc->index = 0;
            return AVERROR(ENOMEM);
+        }
        pc->buffer = new_buffer;
        memcpy(&pc->buffer[pc->index], *buf, *buf_size);
        pc->index += *buf_size;
@ -285,9 +287,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
    /* append to buffer */
    if(pc->index){
        void* new_buffer = av_fast_realloc(pc->buffer, &pc->buffer_size, next + pc->index + FF_INPUT_BUFFER_PADDING_SIZE);
-
-        if(!new_buffer)
+        if(!new_buffer) {
+            pc->overread_index =
+            pc->index = 0;
            return AVERROR(ENOMEM);
+        }
        pc->buffer = new_buffer;
        memcpy(&pc->buffer[pc->index], *buf, next + FF_INPUT_BUFFER_PADDING_SIZE );
        pc->index = 0;
Author	SHA1	Message	Date
Michael Niedermayer	0a849fe1f2	MAINTAINERS: Remove myself as leader Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit `f2c58931e6`) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2015-07-31 18:35:42 +02:00
Michael Niedermayer	101e1b36cc	avcodec/jpeglsdec: check err value for ls_get_code_runterm() Fixes infinite loop Fixes Ticket3086 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit `cc0e47b550`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-01-16 20:54:14 +01:00
Michael Niedermayer	9a073b1f0f	avcodec/parser: reset indexes on realloc failure Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit `f31011e9ab`) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2014-01-16 20:54:14 +01:00
Michael Niedermayer	792ee2f775	Merge remote-tracking branch 'qatar/release/0.6' into release/0.6 * qatar/release/0.6: arm: Don't clobber callee saved registers in scalarproduct See: `a94d12b690` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-01-16 20:53:57 +01:00
Martin Storsjö	a94d12b690	arm: Don't clobber callee saved registers in scalarproduct q4-q7/d8-d15 are supposed to not be clobbered by the callee. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit `d307e408d4`)	2013-12-21 10:00:40 +01:00
Martin Storsjö	0cbef38cb8	arm: Don't clobber callee saved registers in scalarproduct q4-q7/d8-d15 are supposed to not be clobbered by the callee. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit `d307e408d4`) Signed-off-by: Martin Storsjö <martin@martin.st>	2013-12-20 22:11:04 +02:00