http://git.videolan.org/?p=ffmpeg.git;a=patch;h=49b8709870e4fa4d577ce6909d4bc6e03cedfe4e http://git.videolan.org/?p=ffmpeg.git;a=patch;h=6a3fed87498b425d19dee4b57d969e10e2dd5f43 http://git.videolan.org/?p=ffmpeg.git;a=patch;h=d7e5301e438ffb39697b4834769e3f0e3a4e36bd diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4a0c2fa..c02013e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1223,7 +1223,6 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, int idx static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) { EbmlList *seekhead_list = &matroska->seekhead; - MatroskaSeekhead *seekhead = seekhead_list->elem; int64_t before_pos = avio_tell(matroska->ctx->pb); int i; @@ -1233,6 +1232,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska) return; for (i = 0; i < seekhead_list->nb_elem; i++) { + MatroskaSeekhead *seekhead = seekhead_list->elem; if (seekhead[i].pos <= before_pos) continue; diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 1624948..251442b 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -156,7 +156,7 @@ void ff_vorbis_ready_floor1_list(vorbis_floor1_entry * list, int values) } } -static inline void render_line_unrolled(intptr_t x, intptr_t y, int x1, +static inline void render_line_unrolled(intptr_t x, unsigned char y, int x1, intptr_t sy, int ady, int adx, float *buf) { @@ -191,7 +191,7 @@ static void render_line(int x0, int y0, int x1, int y1, float *buf) } else { int base = dy / adx; int x = x0; - int y = y0; + unsigned char y = y0; int err = -adx; ady -= FFABS(base) * adx; while (++x < x1) { diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 251442b..9e5dfd8 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -179,7 +179,7 @@ static inline void render_line_unrolled(intptr_t x, unsigned char y, int x1, } } -static void render_line(int x0, int y0, int x1, int y1, float *buf) +static void render_line(int x0, unsigned char y0, int x1, int y1, float *buf) { int dy = y1 - y0; int adx = x1 - x0;