August 2014 - ffmpeg-cvslog - lists.ffmpeg.org

lavu/hash.c: Add missing "static const".
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Fri Aug 29 18:34:28 2014 +0200| [2ca7edda89bf9294fbdbfee3d503b551f0011da5] | committer: Reimar Döffinger lavu/hash.c: Add missing "static const". Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ca7edda89bf9294f… --- libavutil/hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hash.c b/libavutil/hash.c index 773f29e..7037b0d 100644 --- a/libavutil/hash.c +++ b/libavutil/hash.c @@ -60,7 +60,7 @@ typedef struct AVHashContext { uint32_t crc; } AVHashContext; -struct { +static const struct { const char *name; int size; } hashdesc[] = {

1 0

Add av_cold to table generation functions.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sat Aug 30 17:35:18 2014 +0200| [03bf4572419739a6a308c2a667a62f4797fadf49] | committer: Reimar Döffinger Add av_cold to table generation functions. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=03bf4572419739a6a… --- libavcodec/aac_tablegen.h | 2 +- libavcodec/aacps_tablegen.h | 4 ++-- libavcodec/cbrt_tablegen.h | 3 ++- libavcodec/dv_tablegen.h | 3 ++- libavcodec/motionpixels_tablegen.h | 7 ++++--- libavcodec/mpegaudio_tablegen.h | 3 ++- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/libavcodec/aac_tablegen.h b/libavcodec/aac_tablegen.h index 1c19a15..bf71e59 100644 --- a/libavcodec/aac_tablegen.h +++ b/libavcodec/aac_tablegen.h @@ -31,7 +31,7 @@ #include "libavutil/mathematics.h" float ff_aac_pow2sf_tab[428]; -void ff_aac_tableinit(void) +av_cold void ff_aac_tableinit(void) { int i; for (i = 0; i < 428; i++) diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h index 9df38ff..ca1112d 100644 --- a/libavcodec/aacps_tablegen.h +++ b/libavcodec/aacps_tablegen.h @@ -70,7 +70,7 @@ static const float g2_Q4[] = { 0.16486303567403f, 0.23279856662996f, 0.25f }; -static void make_filters_from_proto(float (*filter)[8][2], const float *proto, int bands) +static av_cold void make_filters_from_proto(float (*filter)[8][2], const float *proto, int bands) { int q, n; for (q = 0; q < bands; q++) { @@ -82,7 +82,7 @@ static void make_filters_from_proto(float (*filter)[8][2], const float *proto, i } } -static void ps_tableinit(void) +static av_cold void ps_tableinit(void) { static const float ipdopd_sin[] = { 0, M_SQRT1_2, 1, M_SQRT1_2, 0, -M_SQRT1_2, -1, -M_SQRT1_2 }; static const float ipdopd_cos[] = { 1, M_SQRT1_2, 0, -M_SQRT1_2, -1, -M_SQRT1_2, 0, M_SQRT1_2 }; diff --git a/libavcodec/cbrt_tablegen.h b/libavcodec/cbrt_tablegen.h index 0db64fc..d8c77c2 100644 --- a/libavcodec/cbrt_tablegen.h +++ b/libavcodec/cbrt_tablegen.h @@ -25,6 +25,7 @@ #include <stdint.h> #include <math.h> +#include "libavutil/attributes.h" #if CONFIG_HARDCODED_TABLES #define cbrt_tableinit() @@ -32,7 +33,7 @@ #else static uint32_t cbrt_tab[1 << 13]; -static void cbrt_tableinit(void) +static av_cold void cbrt_tableinit(void) { if (!cbrt_tab[(1<<13) - 1]) { int i; diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h index c04b802..cc6605b 100644 --- a/libavcodec/dv_tablegen.h +++ b/libavcodec/dv_tablegen.h @@ -24,6 +24,7 @@ #define AVCODEC_DV_TABLEGEN_H #include <stdint.h> +#include "libavutil/attributes.h" #include "dvdata.h" @@ -47,7 +48,7 @@ typedef struct dv_vlc_pair { #else static struct dv_vlc_pair dv_vlc_map[DV_VLC_MAP_RUN_SIZE][DV_VLC_MAP_LEV_SIZE]; -static void dv_vlc_map_tableinit(void) +static av_cold void dv_vlc_map_tableinit(void) { int i, j; for (i = 0; i < NB_DV_VLC - 1; i++) { diff --git a/libavcodec/motionpixels_tablegen.h b/libavcodec/motionpixels_tablegen.h index 8fb840f..4ffe74c 100644 --- a/libavcodec/motionpixels_tablegen.h +++ b/libavcodec/motionpixels_tablegen.h @@ -24,6 +24,7 @@ #define AVCODEC_MOTIONPIXELS_TABLEGEN_H #include <stdint.h> +#include "libavutil/attributes.h" typedef struct YuvPixel { int8_t y, v, u; @@ -49,7 +50,7 @@ static int mp_yuv_to_rgb(int y, int v, int u, int clip_rgb) { #else static YuvPixel mp_rgb_yuv_table[1 << 15]; -static void mp_set_zero_yuv(YuvPixel *p) +static av_cold void mp_set_zero_yuv(YuvPixel *p) { int i, j; @@ -63,7 +64,7 @@ static void mp_set_zero_yuv(YuvPixel *p) } } -static void mp_build_rgb_yuv_table(YuvPixel *p) +static av_cold void mp_build_rgb_yuv_table(YuvPixel *p) { int y, v, u, i; @@ -81,7 +82,7 @@ static void mp_build_rgb_yuv_table(YuvPixel *p) mp_set_zero_yuv(p + i * 32); } -static void motionpixels_tableinit(void) +static av_cold void motionpixels_tableinit(void) { if (!mp_rgb_yuv_table[0].u) mp_build_rgb_yuv_table(mp_rgb_yuv_table); diff --git a/libavcodec/mpegaudio_tablegen.h b/libavcodec/mpegaudio_tablegen.h index f9557c9..86b2cd3 100644 --- a/libavcodec/mpegaudio_tablegen.h +++ b/libavcodec/mpegaudio_tablegen.h @@ -25,6 +25,7 @@ #include <stdint.h> #include <math.h> +#include "libavutil/attributes.h" #define TABLE_4_3_SIZE (8191 + 16)*4 #if CONFIG_HARDCODED_TABLES @@ -41,7 +42,7 @@ static float expval_table_float[512][16]; #define FRAC_BITS 23 #define IMDCT_SCALAR 1.759 -static void mpegaudio_tableinit(void) +static av_cold void mpegaudio_tableinit(void) { int i, value, exponent; for (i = 1; i < TABLE_4_3_SIZE; i++) {

1 0

WMA: add "const" to avoid warnings with hardcoded tables.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Sat Aug 30 17:58:51 2014 +0200| [4fe448738e8d4d87295e1fc7b68bb04f7453c3b9] | committer: Reimar Döffinger WMA: add "const" to avoid warnings with hardcoded tables. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4fe448738e8d4d872… --- libavcodec/wma.h | 2 +- libavcodec/wmaprodec.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/wma.h b/libavcodec/wma.h index c4056ec..01244a0 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -115,7 +115,7 @@ typedef struct WMACodecContext { DECLARE_ALIGNED(32, float, coefs)[MAX_CHANNELS][BLOCK_MAX_SIZE]; DECLARE_ALIGNED(32, FFTSample, output)[BLOCK_MAX_SIZE * 2]; FFTContext mdct_ctx[BLOCK_NB_SIZES]; - float *windows[BLOCK_NB_SIZES]; + const float *windows[BLOCK_NB_SIZES]; /* output buffer for one frame and the last for IMDCT windowing */ DECLARE_ALIGNED(32, float, frame_out)[MAX_CHANNELS][BLOCK_MAX_SIZE * 2]; /* last frame info */ diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 2f6c485..f45e1fc 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -177,7 +177,7 @@ typedef struct WMAProDecodeCtx { PutBitContext pb; ///< context for filling the frame_data buffer FFTContext mdct_ctx[WMAPRO_BLOCK_SIZES]; ///< MDCT context per block size DECLARE_ALIGNED(32, float, tmp)[WMAPRO_BLOCK_MAX_SIZE]; ///< IMDCT output buffer - float* windows[WMAPRO_BLOCK_SIZES]; ///< windows for the different block sizes + const float* windows[WMAPRO_BLOCK_SIZES]; ///< windows for the different block sizes /* frame size dependent frame information (set during initialization) */ uint32_t decode_flags; ///< used compression features @@ -1055,7 +1055,7 @@ static void wmapro_window(WMAProDecodeCtx *s) int i; for (i = 0; i < s->channels_for_cur_subframe; i++) { int c = s->channel_indexes_for_cur_subframe[i]; - float* window; + const float* window; int winlen = s->channel[c].prev_block_len; float* start = s->channel[c].coeffs - (winlen >> 1);

1 0

lavfi: add const/static const to pix_fmts arrays.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Fri Aug 29 18:42:47 2014 +0200| [c9a4ec79690fcc36fbac6fcc77cc0ab128a91a82] | committer: Reimar Döffinger lavfi: add const/static const to pix_fmts arrays. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9a4ec79690fcc36f… --- libavfilter/vf_blackdetect.c | 2 +- libavfilter/vf_lenscorrection.c | 2 +- libavfilter/vf_signalstats.c | 2 +- libavfilter/vf_tinterlace.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index 94af613..87a7a23 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -64,7 +64,7 @@ AVFILTER_DEFINE_CLASS(blackdetect); #define YUVJ_FORMATS \ AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P -static enum AVPixelFormat yuvj_formats[] = { +static const enum AVPixelFormat yuvj_formats[] = { YUVJ_FORMATS, AV_PIX_FMT_NONE }; diff --git a/libavfilter/vf_lenscorrection.c b/libavfilter/vf_lenscorrection.c index 58184b0..9fb1424 100644 --- a/libavfilter/vf_lenscorrection.c +++ b/libavfilter/vf_lenscorrection.c @@ -98,7 +98,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int job, int nb_jobs) static int query_formats(AVFilterContext *ctx) { - static enum AVPixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUVJ420P, diff --git a/libavfilter/vf_signalstats.c b/libavfilter/vf_signalstats.c index 263de23..53f7401 100644 --- a/libavfilter/vf_signalstats.c +++ b/libavfilter/vf_signalstats.c @@ -94,7 +94,7 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { // TODO: add more - enum AVPixelFormat pix_fmts[] = { + static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_NONE }; diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index 3ebb971..6bc55b5 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -80,7 +80,7 @@ AVFILTER_DEFINE_CLASS(tinterlace); #define FULL_SCALE_YUVJ_FORMATS \ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P -static enum AVPixelFormat full_scale_yuvj_pix_fmts[] = { +static const enum AVPixelFormat full_scale_yuvj_pix_fmts[] = { FULL_SCALE_YUVJ_FORMATS, AV_PIX_FMT_NONE };

1 0

ac3dec_fixed: add missing "static const".
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Fri Aug 29 18:50:53 2014 +0200| [3bc5d2a06401bec22865cff6084b35ecf757baa2] | committer: Reimar Döffinger ac3dec_fixed: add missing "static const". Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bc5d2a06401bec22… --- libavcodec/ac3dec_fixed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c index f36e7b0..4c09de5 100644 --- a/libavcodec/ac3dec_fixed.c +++ b/libavcodec/ac3dec_fixed.c @@ -65,7 +65,7 @@ static const uint8_t center_levels[4] = { 4, 5, 6, 5 }; */ static const uint8_t surround_levels[4] = { 4, 6, 7, 6 }; -int end_freq_inv_tab[8] = +static const int end_freq_inv_tab[8] = { 50529027, 44278013, 39403370, 32292987, 27356480, 23729101, 20951060, 18755316 };

1 0

sipr16kdata.h: add forgotten const.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Fri Aug 29 18:40:14 2014 +0200| [18464d7270d2f9290fdd07c7726d16a7abf05dc6] | committer: Reimar Döffinger sipr16kdata.h: add forgotten const. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18464d7270d2f9290… --- libavcodec/sipr16k.c | 2 +- libavcodec/sipr16kdata.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/sipr16k.c b/libavcodec/sipr16k.c index bfd8ade..9c8f684 100644 --- a/libavcodec/sipr16k.c +++ b/libavcodec/sipr16k.c @@ -50,7 +50,7 @@ static void lsf2lsp(const float *lsf, double *lsp) lsp[i] = cosf(lsf[i]); } -static void dequant(float *out, const int *idx, const float *cbs[]) +static void dequant(float *out, const int *idx, const float * const cbs[]) { int i; diff --git a/libavcodec/sipr16kdata.h b/libavcodec/sipr16kdata.h index 96bf0e9..16a653d 100644 --- a/libavcodec/sipr16kdata.h +++ b/libavcodec/sipr16kdata.h @@ -525,7 +525,7 @@ static const float lsf_cb5_16k[128][4] = { { 0.124405, 0.009943, -0.148477, -0.205184} }; -static const float *lsf_codebooks_16k[] = { +static const float * const lsf_codebooks_16k[] = { lsf_cb1_16k[0], lsf_cb2_16k[0], lsf_cb3_16k[0], lsf_cb4_16k[0], lsf_cb5_16k[0] };

1 0

fft_template: Move variables to where they are used.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Fri Aug 29 18:32:20 2014 +0200| [2bb66cc8befda588c560374b86bd43713908bf44] | committer: Reimar Döffinger fft_template: Move variables to where they are used. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2bb66cc8befda588c… --- libavcodec/fft_template.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c index 3abf948..23ea453 100644 --- a/libavcodec/fft_template.c +++ b/libavcodec/fft_template.c @@ -228,8 +228,6 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { int n4, n2, n34; FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8; FFTComplex *tmpz; - FFTSample w_re, w_im; - const FFTSample *w_re_ptr, *w_im_ptr; const int fft_size = (1 << s->nbits); int64_t accu; @@ -322,6 +320,8 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { num_transforms = (num_transforms >> 1) | 1; for (n=0; n<num_transforms; n++){ + const FFTSample *w_re_ptr = ff_w_tab_sr + step; + const FFTSample *w_im_ptr = ff_w_tab_sr + MAX_FFT_SIZE/(4*16) - step; offset = ff_fft_offsets_lut[n] << nbits; tmpz = z + offset; @@ -339,12 +339,9 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { tmpz[n34].im = tmpz[n4].im + tmp1; tmpz[ n4].im = tmpz[n4].im - tmp1; - w_re_ptr = ff_w_tab_sr + step; - w_im_ptr = ff_w_tab_sr + MAX_FFT_SIZE/(4*16) - step; - for (i=1; i<n4; i++){ - w_re = w_re_ptr[0]; - w_im = w_im_ptr[0]; + FFTSample w_re = w_re_ptr[0]; + FFTSample w_im = w_im_ptr[0]; accu = (int64_t)w_re*tmpz[ n2+i].re; accu += (int64_t)w_im*tmpz[ n2+i].im; tmp1 = (int32_t)((accu + 0x40000000) >> 31);

1 0

fft: add ff_ prefix to some global arrays.
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> | Fri Aug 29 18:26:57 2014 +0200| [1654514ab0b0335cb3d2911c812ebced52dd20e4] | committer: Reimar Döffinger fft: add ff_ prefix to some global arrays. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger(a)gmx.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1654514ab0b0335cb… --- libavcodec/fft_init_table.c | 4 ++-- libavcodec/fft_table.h | 4 ++-- libavcodec/fft_template.c | 12 ++++++------ libavcodec/mips/fft_mips.c | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/fft_init_table.c b/libavcodec/fft_init_table.c index 4e8b082..4d74f8a 100644 --- a/libavcodec/fft_init_table.c +++ b/libavcodec/fft_init_table.c @@ -53,7 +53,7 @@ */ #include "libavcodec/fft_table.h" -const int32_t w_tab_sr[MAX_FFT_SIZE/(4*16)] = { +const int32_t ff_w_tab_sr[MAX_FFT_SIZE/(4*16)] = { 2147483647, 2147481121, 2147473542, 2147460908, 2147443222, 2147420483, 2147392690, 2147359845, 2147321946, 2147278995, 2147230991, 2147177934, 2147119825, 2147056664, 2146988450, 2146915184, 2146836866, 2146753497, 2146665076, 2146571603, 2146473080, 2146369505, 2146260881, 2146147205, @@ -184,7 +184,7 @@ const int32_t w_tab_sr[MAX_FFT_SIZE/(4*16)] = { 26352928, 23058947, 19764913, 16470832, 13176712, 9882561, 6588387, 3294197 }; -uint16_t fft_offsets_lut[0x2aab]; +uint16_t ff_fft_offsets_lut[0x2aab]; void ff_fft_lut_init(uint16_t *table, int off, int size, int *index) { diff --git a/libavcodec/fft_table.h b/libavcodec/fft_table.h index 4cd3a45..e5e54b6 100644 --- a/libavcodec/fft_table.h +++ b/libavcodec/fft_table.h @@ -59,8 +59,8 @@ #define MAX_LOG2_NFFT 16 //!< Specifies maximum allowed fft size #define MAX_FFT_SIZE (1 << MAX_LOG2_NFFT) -extern const int32_t w_tab_sr[]; -extern uint16_t fft_offsets_lut[]; +extern const int32_t ff_w_tab_sr[]; +extern uint16_t ff_fft_offsets_lut[]; void ff_fft_lut_init(uint16_t *table, int off, int size, int *index); #endif /* AVCODEC_FFT_TABLE_H */ diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c index 697d1fc..3abf948 100644 --- a/libavcodec/fft_template.c +++ b/libavcodec/fft_template.c @@ -166,7 +166,7 @@ av_cold int ff_fft_init(FFTContext *s, int nbits, int inverse) #if FFT_FIXED_32 { int n=0; - ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n); + ff_fft_lut_init(ff_fft_offsets_lut, 0, 1 << 16, &n); } #else /* FFT_FIXED_32 */ #if FFT_FLOAT @@ -236,7 +236,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { num_transforms = (0x2aab >> (16 - s->nbits)) | 1; for (n=0; n<num_transforms; n++){ - offset = fft_offsets_lut[n] << 2; + offset = ff_fft_offsets_lut[n] << 2; tmpz = z + offset; tmp1 = tmpz[0].re + tmpz[1].re; @@ -264,7 +264,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { num_transforms = (num_transforms >> 1) | 1; for (n=0; n<num_transforms; n++){ - offset = fft_offsets_lut[n] << 3; + offset = ff_fft_offsets_lut[n] << 3; tmpz = z + offset; tmp1 = tmpz[4].re + tmpz[5].re; @@ -322,7 +322,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { num_transforms = (num_transforms >> 1) | 1; for (n=0; n<num_transforms; n++){ - offset = fft_offsets_lut[n] << nbits; + offset = ff_fft_offsets_lut[n] << nbits; tmpz = z + offset; tmp5 = tmpz[ n2].re + tmpz[n34].re; @@ -339,8 +339,8 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) { tmpz[n34].im = tmpz[n4].im + tmp1; tmpz[ n4].im = tmpz[n4].im - tmp1; - w_re_ptr = w_tab_sr + step; - w_im_ptr = w_tab_sr + MAX_FFT_SIZE/(4*16) - step; + w_re_ptr = ff_w_tab_sr + step; + w_im_ptr = ff_w_tab_sr + MAX_FFT_SIZE/(4*16) - step; for (i=1; i<n4; i++){ w_re = w_re_ptr[0]; diff --git a/libavcodec/mips/fft_mips.c b/libavcodec/mips/fft_mips.c index d240f1f..691f2db 100644 --- a/libavcodec/mips/fft_mips.c +++ b/libavcodec/mips/fft_mips.c @@ -87,7 +87,7 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z) for (n=0; n<num_transforms; n++) { - offset = fft_offsets_lut[n] << 2; + offset = ff_fft_offsets_lut[n] << 2; tmpz = z + offset; tmp1 = tmpz[0].re + tmpz[1].re; @@ -116,7 +116,7 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z) num_transforms = (num_transforms >> 1) | 1; for (n=0; n<num_transforms; n++) { - offset = fft_offsets_lut[n] << 3; + offset = ff_fft_offsets_lut[n] << 3; tmpz = z + offset; __asm__ volatile ( @@ -227,7 +227,7 @@ static void ff_fft_calc_mips(FFTContext *s, FFTComplex *z) n34 = 3 * n4; for (n=0; n<num_transforms; n++) { - offset = fft_offsets_lut[n] << nbits; + offset = ff_fft_offsets_lut[n] << nbits; tmpz = z + offset; tmpz_n2 = tmpz + n2; @@ -521,7 +521,7 @@ av_cold void ff_fft_init_mips(FFTContext *s) { int n=0; - ff_fft_lut_init(fft_offsets_lut, 0, 1 << 16, &n); + ff_fft_lut_init(ff_fft_offsets_lut, 0, 1 << 16, &n); ff_init_ff_cos_tabs(16); #if HAVE_INLINE_ASM

1 0

avcodec/h264: Do not get stuck on IDR inter frames
by git＠videolan.org 31 Aug '14

31 Aug '14

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Aug 31 03:43:56 2014 +0200| [e0237208b428d4da20cbb361c74b2086528faaf7] | committer: Michael Niedermayer avcodec/h264: Do not get stuck on IDR inter frames Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0237208b428d4da2… --- libavcodec/h264.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 8ed9f48..0fcc769 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1567,6 +1567,12 @@ again: switch (hx->nal_unit_type) { case NAL_IDR_SLICE: + if ((ptr[0] & 0xFC) == 0x98) { + av_log(h->avctx, AV_LOG_ERROR, "Invalid inter IDR frame\n"); + h->next_outputed_poc = INT_MIN; + ret = -1; + goto end; + } if (h->nal_unit_type != NAL_IDR_SLICE) { av_log(h->avctx, AV_LOG_ERROR, "Invalid mix of idr and non-idr slices\n");

1 0

[ffmpeg-web] branch master updated. 237d416 web/security: add 1.1.14
by ffmpeg-cvslog＠ffmpeg.org 30 Aug '14

30 Aug '14

The branch, master has been updated via 237d4160182e6795d93591f107a21fb781b5f718 (commit) from 4a348c097f6d9a110a2f4c4541e9afbd7464a9c2 (commit) - Log ----------------------------------------------------------------- commit 237d4160182e6795d93591f107a21fb781b5f718 Author: Michael Niedermayer <michaelni(a)gmx.at> AuthorDate: Sat Aug 30 23:30:39 2014 +0200 Commit: Michael Niedermayer <michaelni(a)gmx.at> CommitDate: Sat Aug 30 23:30:39 2014 +0200 web/security: add 1.1.14 diff --git a/src/security b/src/security index 8abf731..da94f25 100644 --- a/src/security +++ b/src/security @@ -270,6 +270,15 @@ CVE-2013-0894, 2c16bf2de07c68513072bf3cc96401d2c6291a3e <h2>FFmpeg 1.1</h2> +<h3>1.1.14</h3> +<p> +Fixes following vulnerabilities: +</p> +<pre> +CVE-2014-5272, 5865d599c38850b2a1fd33fe197eb8fcc6c970a4 / 3539d6c63a16e1b2874bb037a86f317449c58770 +CVE-2014-5271, 11a61dd0e2b51bdb610a80e322667c3284f6d761 / 52b81ff4635c077b2bc8b8d3637d933b6629d803 +</pre> + <h3>1.1.12</h3> <p> Fixes following vulnerabilities: ----------------------------------------------------------------------- Summary of changes: src/security | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) hooks/post-receive --

1 0