[FFmpeg-cvslog] avcodec/libmp3lame: Use avpriv_float_dsp_alloc()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
11:21:50 2014 +0100| [1aca990bd9e3738d4d92575d848fa0558a48df0d] | committer: 
Michael Niedermayer

avcodec/libmp3lame: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1aca990bd9e3738d4d92575d848fa0558a48df0d
---

 libavcodec/libmp3lame.c |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index d8a444d..e33919b 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -52,7 +52,7 @@ typedef struct LAMEContext {
 int abr;
 float *samples_flt[2];
 AudioFrameQueue afq;
-AVFloatDSPContext fdsp;
+AVFloatDSPContext *fdsp;
 } LAMEContext;
 
 
@@ -79,6 +79,7 @@ static av_cold int mp3lame_encode_close(AVCodecContext *avctx)
 av_freep(&s->samples_flt[0]);
 av_freep(&s->samples_flt[1]);
 av_freep(&s->buffer);
+av_freep(&s->fdsp);
 
 ff_af_queue_close(&s->afq);
 
@@ -158,7 +159,12 @@ static av_cold int mp3lame_encode_init(AVCodecContext 
*avctx)
 if (ret < 0)
 goto error;
 
-avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+s->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
+if (!s->fdsp) {
+ret = AVERROR(ENOMEM);
+goto error;
+}
+
 
 return 0;
 error:
@@ -197,7 +203,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, 
AVPacket *avpkt,
 return AVERROR(EINVAL);
 }
 for (ch = 0; ch < avctx->channels; ch++) {
-s->fdsp.vector_fmul_scalar(s->samples_flt[ch],
+s->fdsp->vector_fmul_scalar(s->samples_flt[ch],
(const float *)frame->data[ch],
32768.0f,
FFALIGN(frame->nb_samples, 8));

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/atrac3: Use avpriv_float_dsp_alloc()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
11:23:34 2014 +0100| [93f959b672b1673f5eab5ca072bf9bdcee4b21bd] | committer: 
Michael Niedermayer

avcodec/atrac3: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93f959b672b1673f5eab5ca072bf9bdcee4b21bd
---

 libavcodec/atrac3.c |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index d9f1348..9dc0811 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -109,7 +109,7 @@ typedef struct ATRAC3Context {
 AtracGCContextgainc_ctx;
 FFTContextmdct_ctx;
 FmtConvertContext fmt_conv;
-AVFloatDSPContext fdsp;
+AVFloatDSPContext *fdsp;
 } ATRAC3Context;
 
 static DECLARE_ALIGNED(32, float, mdct_window)[MDCT_SIZE];
@@ -142,7 +142,7 @@ static void imlt(ATRAC3Context *q, float *input, float 
*output, int odd_band)
 q->mdct_ctx.imdct_calc(&q->mdct_ctx, output, input);
 
 /* Perform windowing on the output. */
-q->fdsp.vector_fmul(output, output, mdct_window, MDCT_SIZE);
+q->fdsp->vector_fmul(output, output, mdct_window, MDCT_SIZE);
 }
 
 /*
@@ -192,6 +192,7 @@ static av_cold int atrac3_decode_close(AVCodecContext 
*avctx)
 
 av_freep(&q->units);
 av_freep(&q->decoded_bytes_buffer);
+av_freep(&q->fdsp);
 
 ff_mdct_end(&q->mdct_ctx);
 
@@ -915,11 +916,11 @@ static av_cold int atrac3_decode_init(AVCodecContext 
*avctx)
 }
 
 ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3);
-avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+q->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
 ff_fmt_convert_init(&q->fmt_conv, avctx);
 
 q->units = av_mallocz_array(avctx->channels, sizeof(*q->units));
-if (!q->units) {
+if (!q->units || !q->fdsp) {
 atrac3_decode_close(avctx);
 return AVERROR(ENOMEM);
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/wma: Use avpriv_float_dsp_alloc()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
11:19:29 2014 +0100| [2fbb9e647cf45ad8d7a3e405949340c93bd01050] | committer: 
Michael Niedermayer

avcodec/wma: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fbb9e647cf45ad8d7a3e405949340c93bd01050
---

 libavcodec/wma.c|6 +-
 libavcodec/wma.h|2 +-
 libavcodec/wmadec.c |   10 +-
 libavcodec/wmaenc.c |6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index ecc7e41..51fda3f 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -86,7 +86,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
 return -1;
 
 ff_fmt_convert_init(&s->fmt_conv, avctx);
-avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
 if (avctx->codec->id == AV_CODEC_ID_WMAV1)
 s->version = 1;
@@ -333,6 +332,10 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
 #endif /* TRACE */
 }
 
+s->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
+if (!s->fdsp)
+return AVERROR(ENOMEM);
+
 /* choose the VLC tables for the coefficients */
 coef_vlc_table = 2;
 if (avctx->sample_rate >= 32000) {
@@ -383,6 +386,7 @@ int ff_wma_end(AVCodecContext *avctx)
 av_freep(&s->level_table[i]);
 av_freep(&s->int_table[i]);
 }
+av_freep(&s->fdsp);
 
 return 0;
 }
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 6e5198a..a232b8a 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -132,7 +132,7 @@ typedef struct WMACodecContext {
 float lsp_pow_m_table1[(1 << LSP_POW_BITS)];
 float lsp_pow_m_table2[(1 << LSP_POW_BITS)];
 FmtConvertContext fmt_conv;
-AVFloatDSPContext fdsp;
+AVFloatDSPContext *fdsp;
 
 #ifdef TRACE
 int frame_count;
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index 6c3f28f..d32ca6f 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -390,14 +390,14 @@ static void wma_window(WMACodecContext *s, float *out)
 block_len = s->block_len;
 bsize = s->frame_len_bits - s->block_len_bits;
 
-s->fdsp.vector_fmul_add(out, in, s->windows[bsize],
+s->fdsp->vector_fmul_add(out, in, s->windows[bsize],
 out, block_len);
 } else {
 block_len = 1 << s->prev_block_len_bits;
 n = (s->block_len - block_len) / 2;
 bsize = s->frame_len_bits - s->prev_block_len_bits;
 
-s->fdsp.vector_fmul_add(out + n, in + n, s->windows[bsize],
+s->fdsp->vector_fmul_add(out + n, in + n, s->windows[bsize],
 out + n, block_len);
 
 memcpy(out + n + block_len, in + n + block_len, n * sizeof(float));
@@ -411,7 +411,7 @@ static void wma_window(WMACodecContext *s, float *out)
 block_len = s->block_len;
 bsize = s->frame_len_bits - s->block_len_bits;
 
-s->fdsp.vector_fmul_reverse(out, in, s->windows[bsize], block_len);
+s->fdsp->vector_fmul_reverse(out, in, s->windows[bsize], block_len);
 } else {
 block_len = 1 << s->next_block_len_bits;
 n = (s->block_len - block_len) / 2;
@@ -419,7 +419,7 @@ static void wma_window(WMACodecContext *s, float *out)
 
 memcpy(out, in, n * sizeof(float));
 
-s->fdsp.vector_fmul_reverse(out + n, in + n, s->windows[bsize],
+s->fdsp->vector_fmul_reverse(out + n, in + n, s->windows[bsize],
 block_len);
 
 memset(out + n + block_len, 0, n * sizeof(float));
@@ -738,7 +738,7 @@ static int wma_decode_block(WMACodecContext *s)
 s->channel_coded[0] = 1;
 }
 
-s->fdsp.butterflies_float(s->coefs[0], s->coefs[1], s->block_len);
+s->fdsp->butterflies_float(s->coefs[0], s->coefs[1], s->block_len);
 }
 
 next:
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index 6337779..08d45e9 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -107,10 +107,10 @@ static void apply_window_and_mdct(AVCodecContext *avctx, 
const AVFrame *frame)
 
 for (ch = 0; ch < avctx->channels; ch++) {
 memcpy(s->output, s->frame_out[ch], window_len * sizeof(*s->output));
-s->fdsp.vector_fmul_scalar(s->frame_out[ch], audio[ch], n, len);
-s->fdsp.vector_fmul_reverse(&s->output[window_len], s->frame_out[ch],
+s->fdsp->vector_fmul_scalar(s->frame_out[ch], audio[ch], n, len);
+s->fdsp->vector_fmul_reverse(&s->output[window_len], s->frame_out[ch],
 win, len);
-s->fdsp.vector_fmul(s->frame_out[ch], s->frame_out[ch], win, len);
+s->fdsp->vector_fmul(s->frame_out[ch], s->frame_out[ch], win, len);
 mdct->mdct_calc(mdct, s->coefs[ch], s->output);
 }
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@f

[FFmpeg-cvslog] avcodec/adxenc: match prediction used in the decoder

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
12:40:03 2014 +0100| [6b0ab561d019c12471920ae136c746d3a54878e8] | committer: 
Michael Niedermayer

avcodec/adxenc: match prediction used in the decoder

The prediction used in the encoder was not correct

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b0ab561d019c12471920ae136c746d3a54878e8
---

 libavcodec/adxenc.c|   25 +++--
 tests/ref/acodec/adpcm-adx |6 +++---
 tests/ref/acodec/adpcm-adx-trellis |6 +++---
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index 05e3245..aee444e 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -43,14 +43,12 @@ static void adx_encode(ADXContext *c, uint8_t *adx, const 
int16_t *wav,
 int s0, s1, s2, d;
 int max = 0;
 int min = 0;
-int data[BLOCK_SAMPLES];
 
 s1 = prev->s1;
 s2 = prev->s2;
 for (i = 0, j = 0; j < 32; i += channels, j++) {
 s0 = wav[i];
 d = ((s0 << COEFF_BITS) - c->coeff[0] * s1 - c->coeff[1] * s2) >> 
COEFF_BITS;
-data[j] = d;
 if (max < d)
 max = d;
 if (min > d)
@@ -58,10 +56,10 @@ static void adx_encode(ADXContext *c, uint8_t *adx, const 
int16_t *wav,
 s2 = s1;
 s1 = s0;
 }
-prev->s1 = s1;
-prev->s2 = s2;
 
 if (max == 0 && min == 0) {
+prev->s1 = s1;
+prev->s2 = s2;
 memset(adx, 0, BLOCK_SIZE);
 return;
 }
@@ -77,8 +75,23 @@ static void adx_encode(ADXContext *c, uint8_t *adx, const 
int16_t *wav,
 AV_WB16(adx, scale);
 
 init_put_bits(&pb, adx + 2, 16);
-for (i = 0; i < BLOCK_SAMPLES; i++)
-put_sbits(&pb, 4, av_clip(data[i] / scale, -8, 7));
+
+s1 = prev->s1;
+s2 = prev->s2;
+for (i = 0, j = 0; j < 32; i += channels, j++) {
+d = ((wav[i] << COEFF_BITS) - c->coeff[0] * s1 - c->coeff[1] * s2) >> 
COEFF_BITS;
+
+d = av_clip(d / scale, -8, 7);
+
+put_sbits(&pb, 4, d);
+
+s0 = ((d << COEFF_BITS) * scale + c->coeff[0] * s1 + c->coeff[1] * s2) 
>> COEFF_BITS;
+s2 = s1;
+s1 = s0;
+}
+prev->s1 = s1;
+prev->s2 = s2;
+
 flush_put_bits(&pb);
 }
 
diff --git a/tests/ref/acodec/adpcm-adx b/tests/ref/acodec/adpcm-adx
index b96d99a..33a502f 100644
--- a/tests/ref/acodec/adpcm-adx
+++ b/tests/ref/acodec/adpcm-adx
@@ -1,4 +1,4 @@
-0a30509d9296b857e134b762b76dbc31 *tests/data/fate/acodec-adpcm-adx.adx
+d82a87942d6500adb4d07d21cbcbdb78 *tests/data/fate/acodec-adpcm-adx.adx
 297720 tests/data/fate/acodec-adpcm-adx.adx
-7260139001fcac62384dad50a1023e75 *tests/data/fate/acodec-adpcm-adx.out.wav
-stddev: 6989.46 PSNR: 19.44 MAXDIFF:65398 bytes:  1058400/  1058432
+4e78a1153eb8fc4dfc050836f46b62f8 *tests/data/fate/acodec-adpcm-adx.out.wav
+stddev: 3096.24 PSNR: 26.51 MAXDIFF:53110 bytes:  1058400/  1058432
diff --git a/tests/ref/acodec/adpcm-adx-trellis 
b/tests/ref/acodec/adpcm-adx-trellis
index fff0291..a36e7f9 100644
--- a/tests/ref/acodec/adpcm-adx-trellis
+++ b/tests/ref/acodec/adpcm-adx-trellis
@@ -1,4 +1,4 @@
-0a30509d9296b857e134b762b76dbc31 *tests/data/fate/acodec-adpcm-adx-trellis.adx
+d82a87942d6500adb4d07d21cbcbdb78 *tests/data/fate/acodec-adpcm-adx-trellis.adx
 297720 tests/data/fate/acodec-adpcm-adx-trellis.adx
-7260139001fcac62384dad50a1023e75 
*tests/data/fate/acodec-adpcm-adx-trellis.out.wav
-stddev: 6989.46 PSNR: 19.44 MAXDIFF:65398 bytes:  1058400/  1058432
+4e78a1153eb8fc4dfc050836f46b62f8 
*tests/data/fate/acodec-adpcm-adx-trellis.out.wav
+stddev: 3096.24 PSNR: 26.51 MAXDIFF:53110 bytes:  1058400/  1058432

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/adxenc: fix rounding

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
12:56:02 2014 +0100| [0b5adc35200888ca87e68823ac73905b7eb4279e] | committer: 
Michael Niedermayer

avcodec/adxenc: fix rounding

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b5adc35200888ca87e68823ac73905b7eb4279e
---

 libavcodec/adxenc.c|2 +-
 tests/ref/acodec/adpcm-adx |6 +++---
 tests/ref/acodec/adpcm-adx-trellis |6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index aee444e..4387ffb 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -81,7 +81,7 @@ static void adx_encode(ADXContext *c, uint8_t *adx, const 
int16_t *wav,
 for (i = 0, j = 0; j < 32; i += channels, j++) {
 d = ((wav[i] << COEFF_BITS) - c->coeff[0] * s1 - c->coeff[1] * s2) >> 
COEFF_BITS;
 
-d = av_clip(d / scale, -8, 7);
+d = av_clip(ROUNDED_DIV(d, scale), -8, 7);
 
 put_sbits(&pb, 4, d);
 
diff --git a/tests/ref/acodec/adpcm-adx b/tests/ref/acodec/adpcm-adx
index 33a502f..34dd9b6 100644
--- a/tests/ref/acodec/adpcm-adx
+++ b/tests/ref/acodec/adpcm-adx
@@ -1,4 +1,4 @@
-d82a87942d6500adb4d07d21cbcbdb78 *tests/data/fate/acodec-adpcm-adx.adx
+d7ec7d52a2f5c91464812d031b07cc1d *tests/data/fate/acodec-adpcm-adx.adx
 297720 tests/data/fate/acodec-adpcm-adx.adx
-4e78a1153eb8fc4dfc050836f46b62f8 *tests/data/fate/acodec-adpcm-adx.out.wav
-stddev: 3096.24 PSNR: 26.51 MAXDIFF:53110 bytes:  1058400/  1058432
+5b5a436ec9d528d6eb0bebaf667521b0 *tests/data/fate/acodec-adpcm-adx.out.wav
+stddev: 2549.93 PSNR: 28.20 MAXDIFF:57514 bytes:  1058400/  1058432
diff --git a/tests/ref/acodec/adpcm-adx-trellis 
b/tests/ref/acodec/adpcm-adx-trellis
index a36e7f9..d620d4a 100644
--- a/tests/ref/acodec/adpcm-adx-trellis
+++ b/tests/ref/acodec/adpcm-adx-trellis
@@ -1,4 +1,4 @@
-d82a87942d6500adb4d07d21cbcbdb78 *tests/data/fate/acodec-adpcm-adx-trellis.adx
+d7ec7d52a2f5c91464812d031b07cc1d *tests/data/fate/acodec-adpcm-adx-trellis.adx
 297720 tests/data/fate/acodec-adpcm-adx-trellis.adx
-4e78a1153eb8fc4dfc050836f46b62f8 
*tests/data/fate/acodec-adpcm-adx-trellis.out.wav
-stddev: 3096.24 PSNR: 26.51 MAXDIFF:53110 bytes:  1058400/  1058432
+5b5a436ec9d528d6eb0bebaf667521b0 
*tests/data/fate/acodec-adpcm-adx-trellis.out.wav
+stddev: 2549.93 PSNR: 28.20 MAXDIFF:57514 bytes:  1058400/  1058432

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] ffmpeg: take bsf arguments from the command line

[Christophe Gisquet]

ffmpeg | branch: master | Christophe Gisquet  | 
Sat Nov 29 19:15:02 2014 +0100| [4c592c39087a15e2b37aa46956775b7fa869fa57] | 
committer: Michael Niedermayer

ffmpeg: take bsf arguments from the command line

The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c592c39087a15e2b37aa46956775b7fa869fa57
---

 doc/bitstream_filters.texi |8 
 ffmpeg.c   |7 ++-
 ffmpeg.h   |1 +
 ffmpeg_opt.c   |4 
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi
index 58ebddd..8124238 100644
--- a/doc/bitstream_filters.texi
+++ b/doc/bitstream_filters.texi
@@ -13,6 +13,14 @@ bitstream filter using the option @code{--disable-bsf=BSF}.
 The option @code{-bsfs} of the ff* tools will display the list of
 all the supported bitstream filters included in your build.
 
+The ff* tools have a -bsf option applied per stream, taking a
+comma-separated list of filters, whose parameters follow the filter
+name after a '='.
+
+@example
+ffmpeg -i INPUT -c:v copy -bsf:v filter1[=opt1=str1/opt2=str2][,filter2] OUTPUT
+@end example
+
 Below is a description of the currently available bitstream filters.
 
 @section aac_adtstoasc
diff --git a/ffmpeg.c b/ffmpeg.c
index 57abd30..b44401f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -623,7 +623,11 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, 
OutputStream *ost)
 
 while (bsfc) {
 AVPacket new_pkt = *pkt;
-int a = av_bitstream_filter_filter(bsfc, avctx, NULL,
+AVDictionaryEntry *bsf_arg = av_dict_get(ost->bsf_args,
+ bsfc->filter->name,
+ NULL, 0);
+int a = av_bitstream_filter_filter(bsfc, avctx,
+   bsf_arg ? bsf_arg->value : NULL,
&new_pkt.data, &new_pkt.size,
pkt->data, pkt->size,
pkt->flags & AV_PKT_FLAG_KEY);
@@ -3834,6 +3838,7 @@ static int transcode(void)
 av_dict_free(&ost->encoder_opts);
 av_dict_free(&ost->swr_opts);
 av_dict_free(&ost->resample_opts);
+av_dict_free(&ost->bsf_args);
 }
 }
 }
diff --git a/ffmpeg.h b/ffmpeg.h
index 8107fe7..117a35c 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -422,6 +422,7 @@ typedef struct OutputStream {
 AVDictionary *encoder_opts;
 AVDictionary *swr_opts;
 AVDictionary *resample_opts;
+AVDictionary *bsf_args;
 char *apad;
 OSTFinished finished;/* no more packets should be written for this 
stream */
 int unavailable; /* true if the steram is unavailable 
(possibly temporarily) */
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 03e049b..1f281f6 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -1138,8 +1138,11 @@ static OutputStream *new_output_stream(OptionsContext 
*o, AVFormatContext *oc, e
 
 MATCH_PER_STREAM_OPT(bitstream_filters, str, bsf, oc, st);
 while (bsf) {
+char *arg = NULL;
 if (next = strchr(bsf, ','))
 *next++ = 0;
+if (arg = strchr(bsf, '='))
+*arg++ = 0;
 if (!(bsfc = av_bitstream_filter_init(bsf))) {
 av_log(NULL, AV_LOG_FATAL, "Unknown bitstream filter %s\n", bsf);
 exit_program(1);
@@ -1148,6 +1151,7 @@ static OutputStream *new_output_stream(OptionsContext *o, 
AVFormatContext *oc, e
 bsfc_prev->next = bsfc;
 else
 ost->bitstream_filters = bsfc;
+av_dict_set(&ost->bsf_args, bsfc->filter->name, arg, 0);
 
 bsfc_prev = bsfc;
 bsf   = next;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Treat all '*.pnm' files as non-text file

[Reinhard Tartler]

ffmpeg | branch: master | Reinhard Tartler  | Fri Nov 28 
09:52:50 2014 -0500| [0f257e29c5520b215e573e7e3abde8e5a4743309] | committer: 
Reinhard Tartler

Treat all '*.pnm' files as non-text file

This convinces the pre-receive hook to not consider all *.pnm files as
text files to reduce the patch sizes and avoids triggering whitespace
checks,

Contains a correction by Janne Grunau 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f257e29c5520b215e573e7e3abde8e5a4743309
---

 .gitattributes |1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..a900528
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pnm -diff -text

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
18:17:51 2014 +0100| [79440651149c89fba9ef5563c9b8a4b3a59acdf5] | committer: 
Michael Niedermayer

Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
  Treat all '*.pnm' files as non-text file

Merged-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79440651149c89fba9ef5563c9b8a4b3a59acdf5
---



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] LICENSE.md: Add tests/reference.pnm

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
19:09:45 2014 +0100| [21c0c0f9d4a1dcc3279e4309ab89137473abf900] | committer: 
Michael Niedermayer

LICENSE.md: Add tests/reference.pnm

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21c0c0f9d4a1dcc3279e4309ab89137473abf900
---

 LICENSE.md |1 +
 1 file changed, 1 insertion(+)

diff --git a/LICENSE.md b/LICENSE.md
index e0a431b..cf9955f 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -64,6 +64,7 @@ There are a handful of files under other licensing terms, 
namely:
   documentation accompanying your program if you only distribute executables.
   You must also indicate any changes including additions and deletions to
   those three files in the documentation.
+  tests/reference.pnm is under the expat license
 
 
 external libraries

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Merge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
18:38:22 2014 +0100| [d828b0814302940c289968e659f9ebf2273338eb] | committer: 
Michael Niedermayer

Merge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'

* commit '8895bf7b78650c0c21c88cec0484e138ec511a4b':
  Replace lena.pnm

Conflicts:
tests/Makefile
tests/ref/seek/vsynth2-asv1
tests/ref/seek/vsynth2-asv2
tests/ref/seek/vsynth2-ffv1
tests/ref/seek/vsynth2-flashsv
tests/ref/seek/vsynth2-flv
tests/ref/seek/vsynth2-h261
tests/ref/seek/vsynth2-h263
tests/ref/seek/vsynth2-h263p
tests/ref/seek/vsynth2-huffyuv
tests/ref/seek/vsynth2-ljpeg
tests/ref/seek/vsynth2-mjpeg
tests/ref/seek/vsynth2-mpeg1
tests/ref/seek/vsynth2-mpeg1b
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/seek/vsynth2-mpeg4
tests/ref/seek/vsynth2-mpeg4-adap
tests/ref/seek/vsynth2-mpeg4-error
tests/ref/seek/vsynth2-mpeg4-nr
tests/ref/seek/vsynth2-mpeg4-qpel
tests/ref/seek/vsynth2-mpeg4-qprd
tests/ref/seek/vsynth2-mpeg4-rc
tests/ref/seek/vsynth2-mpeg4-thread
tests/ref/seek/vsynth2-msmpeg4
tests/ref/seek/vsynth2-msmpeg4v2
tests/ref/seek/vsynth2-roqvideo
tests/ref/seek/vsynth2-rv10
tests/ref/seek/vsynth2-rv20
tests/ref/seek/vsynth2-svq1
tests/ref/seek/vsynth2-wmv1
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth2-asv1
tests/ref/vsynth/vsynth2-asv2
tests/ref/vsynth/vsynth2-cljr
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-720p
tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
tests/ref/vsynth/vsynth2-dnxhd-720p-rd
tests/ref/vsynth/vsynth2-dv
tests/ref/vsynth/vsynth2-dv-411
tests/ref/vsynth/vsynth2-dv-50
tests/ref/vsynth/vsynth2-ffv1
tests/ref/vsynth/vsynth2-ffvhuff
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h263
tests/ref/vsynth/vsynth2-h263-obmc
tests/ref/vsynth/vsynth2-h263p
tests/ref/vsynth/vsynth2-huffyuv
tests/ref/vsynth/vsynth2-jpegls
tests/ref/vsynth/vsynth2-ljpeg
tests/ref/vsynth/vsynth2-mjpeg
tests/ref/vsynth/vsynth2-mpeg1
tests/ref/vsynth/vsynth2-mpeg1b
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-mpeg4-adap
tests/ref/vsynth/vsynth2-mpeg4-adv
tests/ref/vsynth/vsynth2-mpeg4-error
tests/ref/vsynth/vsynth2-mpeg4-nr
tests/ref/vsynth/vsynth2-mpeg4-qpel
tests/ref/vsynth/vsynth2-mpeg4-qprd
tests/ref/vsynth/vsynth2-mpeg4-rc
tests/ref/vsynth/vsynth2-mpeg4-thread
tests/ref/vsynth/vsynth2-msmpeg4
tests/ref/vsynth/vsynth2-msmpeg4v2
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-rgb
tests/ref/vsynth/vsynth2-roqvideo
tests/ref/vsynth/vsynth2-rv10
tests/ref/vsynth/vsynth2-rv20
tests/ref/vsynth/vsynth2-svq1
tests/ref/vsynth/vsynth2-v210
tests/ref/vsynth/vsynth2-wmv1
tests/ref/vsynth/vsynth2-wmv2
tests/ref/vsynth/vsynth2-yuv

See: c4abee734dcbdb589925dd6da98041dcf663ce49
Merged-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d828b0814302940c289968e659f9ebf2273338eb
---



___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] fix Makefile objects for pulseaudio support

[Michael Stypa]

ffmpeg | branch: release/2.4 | Michael Stypa  | Fri Nov 28 
15:54:50 2014 +0100| [9984d492dc51249c3f656d50b90c36e7540002f2] | committer: 
Michael Niedermayer

fix Makefile objects for pulseaudio support

Signed-off-by: Michael Niedermayer 
(cherry picked from commit cb58c771ade66afcc623250e1c7ac8191381d991)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9984d492dc51249c3f656d50b90c36e7540002f2
---

 libavdevice/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index db301e7..d700d9a 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -34,7 +34,7 @@ OBJS-$(CONFIG_OPENGL_OUTDEV) += opengl_enc.o
 OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o oss_audio_dec.o
 OBJS-$(CONFIG_OSS_OUTDEV)+= oss_audio.o oss_audio_enc.o
 OBJS-$(CONFIG_PULSE_INDEV)   += pulse_audio_dec.o \
-pulse_audio_common.o
+pulse_audio_common.o timefilter.o
 OBJS-$(CONFIG_PULSE_OUTDEV)  += pulse_audio_enc.o \
 pulse_audio_common.o
 OBJS-$(CONFIG_QTKIT_INDEV)   += qtkit.o

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavutil/threads.h: correct an include to be local

[Dave Yeo]

ffmpeg | branch: release/2.4 | Dave Yeo  | Fri Nov 28 
23:36:06 2014 -0800| [d48e0aed3c17284f4db71f644bcb5a5646c1cbe8] | committer: 
Michael Niedermayer

libavutil/threads.h: correct an include to be local

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 32eadfe453c32788ea57968e6e80f673f434739d)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d48e0aed3c17284f4db71f644bcb5a5646c1cbe8
---

 libavutil/thread.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/thread.h b/libavutil/thread.h
index a004fba..9733661 100644
--- a/libavutil/thread.h
+++ b/libavutil/thread.h
@@ -31,7 +31,7 @@
 #elif HAVE_OS2THREADS
 #include "compat/os2threads.h"
 #else
-#include 
+#include "compat/w32pthreads.h"
 #endif
 
 #define AVMutex pthread_mutex_t

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavutil/thread.h: Support OS/2 threads

[Dave Yeo]

ffmpeg | branch: release/2.4 | Dave Yeo  | Fri Nov 28 
23:34:20 2014 -0800| [89b52d25b4b847f58bab32901064803f79ac68df] | committer: 
Michael Niedermayer

libavutil/thread.h: Support OS/2 threads

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 090a7801a8817c1fbc6db0ed39070bf82255d8f2)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89b52d25b4b847f58bab32901064803f79ac68df
---

 libavutil/thread.h |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavutil/thread.h b/libavutil/thread.h
index 62e1340..a004fba 100644
--- a/libavutil/thread.h
+++ b/libavutil/thread.h
@@ -24,10 +24,12 @@
 
 #include "config.h"
 
-#if HAVE_PTHREADS || HAVE_W32THREADS
+#if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS
 
 #if HAVE_PTHREADS
 #include 
+#elif HAVE_OS2THREADS
+#include "compat/os2threads.h"
 #else
 #include 
 #endif

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/mjpegdec: Check for pixfmtid 0x42111100 || 0x24111100 with more than 8 bits

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Tue Nov 
25 01:14:38 2014 +0100| [47f345de1dd25178f82f3da68fc584050d3f0ad2] | committer: 
Michael Niedermayer

avcodec/mjpegdec: Check for pixfmtid 0x4200 || 0x2400 with more than 8 
bits

These cases are not supported yet

Fixes assertion failure
Fixes: signal_sigabrt_76ac7bb9_1_cov_1553101927_00.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 0bf416f2628137e5389050fa323c329692dd4ba6)

Conflicts:

libavcodec/mjpegdec.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47f345de1dd25178f82f3da68fc584050d3f0ad2
---

 libavcodec/mjpegdec.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 8966672..2cf55fd 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -514,6 +514,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
 else  s->avctx->pix_fmt = AV_PIX_FMT_YUV420P16;
 s->avctx->color_range = s->cs_itu601 ? AVCOL_RANGE_MPEG : 
AVCOL_RANGE_JPEG;
 if (pix_fmt_id == 0x4200) {
+if (s->bits > 8)
+goto unk_pixfmt;
 s->upscale_h = 6;
 s->chroma_height = (s->height + 1) / 2;
 }

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc/APIchanges: Fix some wrong versions

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Tue Nov 
18 11:52:17 2014 +0100| [2abc6e930ba13af44a846438d63c9d06c0e285dd] | committer: 
Michael Niedermayer

doc/APIchanges: Fix some wrong versions

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4eae568a0712b8b59cb74b3882963f938c26eab4)

Conflicts:

doc/APIchanges

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2abc6e930ba13af44a846438d63c9d06c0e285dd
---

 doc/APIchanges |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 8a28029..7dd1101 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -214,10 +214,10 @@ API changes, most recent first:
 2014-05-11 - 14aef38 / 66e6c8a - lavu 52.83.100 / 53.14.0 - pixfmt.h
   Add AV_PIX_FMT_VDA for new-style VDA acceleration.
 
-2014-05-xx - xxx - lavu 52.82.0 - fifo.h
+2014-05-xx - xxx - lavu 52.82.100 - fifo.h
   Add av_fifo_freep() function.
 
-2014-05-02 - ba52fb11 - lavu 52.81.0 - opt.h
+2014-05-02 - ba52fb11 - lavu 52.81.100 - opt.h
   Add av_opt_set_dict2() function.
 
 2014-05-01 - e77b985 / a2941c8 - lavc 55.60.103 / 55.50.3 - avcodec.h

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat/hlsenc: Free context after hls_append_segment

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Sun Nov 
16 04:02:56 2014 +0100| [3bb48296ef0f54fad7d73c93a36e676ba391b037] | committer: 
Michael Niedermayer

avformat/hlsenc: Free context after hls_append_segment

Fixes reading uninitialized memory

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 530eb6acf8ee867bf00728bf7efaf505da107e17)

Conflicts:

libavformat/hlsenc.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bb48296ef0f54fad7d73c93a36e676ba391b037
---

 libavformat/hlsenc.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index cc142fa..3fceb08 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -329,9 +329,10 @@ static int hls_write_trailer(struct AVFormatContext *s)
 
 av_write_trailer(oc);
 avio_closep(&oc->pb);
-avformat_free_context(oc);
 av_free(hls->basename);
 hls_append_segment(hls, hls->duration);
+avformat_free_context(oc);
+hls->avf = NULL;
 hls_window(s, 1);
 
 hls_free_segments(hls);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swscale/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*()

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Thu Nov 
20 00:43:45 2014 +0100| [af0a95ee033b61113a7059ac66e2f5776c90330c] | committer: 
Michael Niedermayer

swscale/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*()

This avoids out of array accesses
Should fix Ticket3451

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 4388e78a0f022c8572996f9ab568a39b5f716f9d)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af0a95ee033b61113a7059ac66e2f5776c90330c
---

 libswscale/x86/rgb2rgb_template.c |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/libswscale/x86/rgb2rgb_template.c 
b/libswscale/x86/rgb2rgb_template.c
index 3899d0a..7796d38 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1634,6 +1634,16 @@ static inline void RENAME(rgb24toyv12)(const uint8_t 
*src, uint8_t *ydst, uint8_
 #define BGR2V_IDX "16*4+16*34"
 int y;
 const x86_reg chromWidth= width>>1;
+
+if (height > 2) {
+ff_rgb24toyv12_c(src, ydst, udst, vdst, width, 2, lumStride, 
chromStride, srcStride, rgb2yuv);
+src  += 2*srcStride;
+ydst += 2*lumStride;
+udst += chromStride;
+vdst += chromStride;
+height -= 2;
+}
+
 for (y=0; yhttp://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavc/utils: Make pix_fmt desc pointer const.

[Carl Eugen Hoyos]

ffmpeg | branch: release/2.4 | Carl Eugen Hoyos  | Thu Oct 30 
00:27:04 2014 +0100| [2719ba9ee35f2dd1243e67ae85889bcdbc4afe7b] | committer: 
Michael Niedermayer

lavc/utils: Make pix_fmt desc pointer const.

Fixes an "initialization discards qualifiers from pointer target type" warning.
(cherry picked from commit f05855414ed4cce97c06ba2a31f4987af47e6d4e)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2719ba9ee35f2dd1243e67ae85889bcdbc4afe7b
---

 libavcodec/utils.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 4931444..ca6fe2d 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -279,7 +279,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int 
*width, int *height,
 int i;
 int w_align = 1;
 int h_align = 1;
-AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(s->pix_fmt);
+AVPixFmtDescriptor const *desc = av_pix_fmt_desc_get(s->pix_fmt);
 
 if (desc) {
 w_align = 1 << desc->log2_chroma_w;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/utvideodec: fix assumtation that slice_height >= 1

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Mon Nov 
10 19:44:20 2014 +0100| [11dfd1fa20fae31531a3c085cdcc00089dbcaa5f] | committer: 
Michael Niedermayer

avcodec/utvideodec: fix assumtation that slice_height >= 1

Fixes out of array read
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 7656c4c6e66f8a787d384f027ad824cc1677fda1)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11dfd1fa20fae31531a3c085cdcc00089dbcaa5f
---

 libavcodec/utvideodec.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
index afd56ea..05c943f 100644
--- a/libavcodec/utvideodec.c
+++ b/libavcodec/utvideodec.c
@@ -224,7 +224,7 @@ static void restore_median(uint8_t *src, int step, int 
stride,
 A= bsrc[i];
 }
 bsrc += stride;
-if (slice_height == 1)
+if (slice_height <= 1)
 continue;
 // second line - first element has top prediction, the rest uses median
 C= bsrc[-stride];
@@ -284,7 +284,7 @@ static void restore_median_il(uint8_t *src, int step, int 
stride,
 A = bsrc[stride + i];
 }
 bsrc += stride2;
-if (slice_height == 1)
+if (slice_height <= 1)
 continue;
 // second line - first element has top prediction, the rest uses median
 C= bsrc[-stride2];

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/mpeg4video_parser: fix spurious extradata parse warnings

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Sat Nov 
15 17:30:44 2014 +0100| [a3fdc0b35bd78b7f89e8bd76cd7b4e912392d530] | committer: 
Michael Niedermayer

avcodec/mpeg4video_parser: fix spurious extradata parse warnings

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 7d37e45f6bac198bc986aeb987afe219edbbd45a)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3fdc0b35bd78b7f89e8bd76cd7b4e912392d530
---

 libavcodec/mpeg4video_parser.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/mpeg4video_parser.c b/libavcodec/mpeg4video_parser.c
index b7718f6..aa5e87a 100644
--- a/libavcodec/mpeg4video_parser.c
+++ b/libavcodec/mpeg4video_parser.c
@@ -88,7 +88,7 @@ static int mpeg4_decode_header(AVCodecParserContext *s1, 
AVCodecContext *avctx,
 if (avctx->extradata_size && pc->first_picture) {
 init_get_bits(gb, avctx->extradata, avctx->extradata_size * 8);
 ret = ff_mpeg4_decode_picture_header(dec_ctx, gb);
-if (ret < 0)
+if (ret < -1)
 av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata\n");
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/options_table fix min of audio channels and sample rate

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Mon Nov 
 3 13:20:24 2014 +0100| [f7e9fcda2df158171727d3a5691e22e312f35fdd] | committer: 
Michael Niedermayer

avcodec/options_table fix min of audio channels and sample rate

Found-by: Lukasz Marek 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 206c98f303e833c9e94427c9e3f9867f85265f78)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7e9fcda2df158171727d3a5691e22e312f35fdd
---

 libavcodec/options_table.h |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index ad3d52e..5e79f82 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -105,8 +105,8 @@ static const AVOption avcodec_options[] = {
 {"extradata_size", NULL, OFFSET(extradata_size), AV_OPT_TYPE_INT, {.i64 = 
DEFAULT }, INT_MIN, INT_MAX},
 {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 
INT_MIN, INT_MAX},
 {"g", "set the group of picture (GOP) size", OFFSET(gop_size), 
AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E},
-{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, A|D|E},
-{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, 
{.i64 = DEFAULT }, INT_MIN, INT_MAX, A|D|E},
+{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), 
AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E},
+{"ac", "set number of audio channels", OFFSET(channels), AV_OPT_TYPE_INT, 
{.i64 = DEFAULT }, 0, INT_MAX, A|D|E},
 {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), AV_OPT_TYPE_INT, {.i64 = 
DEFAULT }, INT_MIN, INT_MAX, A|E},
 {"frame_size", NULL, OFFSET(frame_size), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 
INT_MIN, INT_MAX, A|E},
 {"frame_number", NULL, OFFSET(frame_number), AV_OPT_TYPE_INT, {.i64 = DEFAULT 
}, INT_MIN, INT_MAX},

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] lavu/opt: fix av_opt_get function

[Lukasz Marek]

ffmpeg | branch: release/2.4 | Lukasz Marek  | Tue 
Nov 11 21:17:58 2014 +0100| [cf8b91a28e9308d49ebc2a107f4a77ac28aeecbc] | 
committer: Michael Niedermayer

lavu/opt: fix av_opt_get function

Signed-off-by: Lukasz Marek 
(cherry picked from commit 173d51c982f1ecaa8d28cd0d8611164be0c9d36d)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cf8b91a28e9308d49ebc2a107f4a77ac28aeecbc
---

 libavutil/opt.c |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index ee72a96..e9ed765 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -725,6 +725,10 @@ int av_opt_get(void *obj, const char *name, int 
search_flags, uint8_t **out_val)
 return AVERROR(EINVAL);
 if (!(*out_val = av_malloc(len*2 + 1)))
 return AVERROR(ENOMEM);
+if (!len) {
+*out_val[0] = '\0';
+return 0;
+}
 bin = *(uint8_t**)dst;
 for (i = 0; i < len; i++)
 snprintf(*out_val + i*2, 3, "%02X", bin[i]);
@@ -740,12 +744,14 @@ int av_opt_get(void *obj, const char *name, int 
search_flags, uint8_t **out_val)
 break;
 case AV_OPT_TYPE_DURATION:
 i64 = *(int64_t *)dst;
-ret = snprintf(buf, sizeof(buf), "%"PRIi64"d:%02d:%02d.%06d",
+ret = snprintf(buf, sizeof(buf), "%"PRIi64":%02d:%02d.%06d",
i64 / 36, (int)((i64 / 6000) % 60),
(int)((i64 / 100) % 60), (int)(i64 % 100));
 break;
 case AV_OPT_TYPE_COLOR:
-ret = snprintf(buf, sizeof(buf), "0x%02x%02x%02x%02x", ((int 
*)dst)[0], ((int *)dst)[1], ((int *)dst)[2], ((int *)dst)[3]);
+ret = snprintf(buf, sizeof(buf), "0x%02x%02x%02x%02x",
+   (int)((uint8_t *)dst)[0], (int)((uint8_t *)dst)[1],
+   (int)((uint8_t *)dst)[2], (int)((uint8_t *)dst)[3]);
 break;
 case AV_OPT_TYPE_CHANNEL_LAYOUT:
 i64 = *(int64_t *)dst;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/hevc_ps: Check num_long_term_ref_pics_sps

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Fri Nov 
28 03:46:56 2014 +0100| [4b8f3c5bf34e517f8a50c5b5152985b8ef725c6b] | committer: 
Michael Niedermayer

avcodec/hevc_ps: Check num_long_term_ref_pics_sps

Fixes out of array access
Fixes: signal_sigsegv_35bd0f0_1182_cov_791726764_STRUCT_B_Samsung_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit ea38e5a6b75706477898eb1e6582d667dbb9946c)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b8f3c5bf34e517f8a50c5b5152985b8ef725c6b
---

 libavcodec/hevc_ps.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 0d6ede2..d79740a 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -951,6 +951,11 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
 sps->long_term_ref_pics_present_flag = get_bits1(gb);
 if (sps->long_term_ref_pics_present_flag) {
 sps->num_long_term_ref_pics_sps = get_ue_golomb_long(gb);
+if (sps->num_long_term_ref_pics_sps > 31U) {
+av_log(0, AV_LOG_ERROR, "num_long_term_ref_pics_sps %d is out of 
range.\n",
+   sps->num_long_term_ref_pics_sps);
+goto err;
+}
 for (i = 0; i < sps->num_long_term_ref_pics_sps; i++) {
 sps->lt_ref_pic_poc_lsb_sps[i]   = get_bits(gb, 
sps->log2_max_poc_lsb);
 sps->used_by_curr_pic_lt_sps_flag[i] = get_bits1(gb);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/flacdec: Call ff_flacdsp_init() unconditionally

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Wed Nov 
26 03:29:03 2014 +0100| [a654f483cd64aa739da5dfaa1b4ca0acb9f478f7] | committer: 
Michael Niedermayer

avcodec/flacdec: Call ff_flacdsp_init() unconditionally

Fixes out of array access
Fixes: signal_sigsegv_324b135_3398_cov_246853371_short.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit e5c01ccdf5a9a330d4c51a9b9ea721fd8f1fb70b)

Conflicts:

libavcodec/flacdec.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a654f483cd64aa739da5dfaa1b4ca0acb9f478f7
---

 libavcodec/flacdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index c9dbc14..a48b177 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -473,10 +473,10 @@ static int decode_frame(FLACContext *s)
 ret = allocate_buffers(s);
 if (ret < 0)
 return ret;
-ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, s->bps);
 s->got_streaminfo = 1;
 dump_headers(s->avctx, (FLACStreaminfo *)s);
 }
+ff_flacdsp_init(&s->dsp, s->avctx->sample_fmt, s->bps);
 
 //dump_headers(s->avctx, (FLACStreaminfo *)s);
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/mjpegdec: Fix integer overflow in shift

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Thu Nov 
27 19:27:05 2014 +0100| [18dba3d80d5b741f145e448c242cdfa2ee7f3511] | committer: 
Michael Niedermayer

avcodec/mjpegdec: Fix integer overflow in shift

Fixes: signal_sigabrt_76ac7bb9_2683_cov_4120310995_m_ijpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 970a8f1c256f08d2f6414d573a54f2fa035c8e7a)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18dba3d80d5b741f145e448c242cdfa2ee7f3511
---

 libavcodec/mjpegdec.c |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 5fdf9be..686ece9 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -244,7 +244,8 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s)
 
 int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
 {
-int len, nb_components, i, width, height, bits, pix_fmt_id, ret;
+int len, nb_components, i, width, height, bits, ret;
+unsigned pix_fmt_id;
 int h_count[MAX_COMPONENTS];
 int v_count[MAX_COMPONENTS];
 
@@ -378,7 +379,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
 else if (!s->lossless)
 s->rgb = 0;
 /* XXX: not complete test ! */
-pix_fmt_id = (s->h_count[0] << 28) | (s->v_count[0] << 24) |
+pix_fmt_id = ((unsigned)s->h_count[0] << 28) | (s->v_count[0] << 24) |
  (s->h_count[1] << 20) | (s->v_count[1] << 16) |
  (s->h_count[2] << 12) | (s->v_count[2] <<  8) |
  (s->h_count[3] <<  4) |  s->v_count[3];

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata()

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Tue Nov 
25 14:45:30 2014 +0100| [991a2034796b18012f65b53e6bb8ce521c881a36] | committer: 
Michael Niedermayer

avcodec/utils: Check that the data is complete in avpriv_bprint_to_extradata()

Fixes out of array read
Fixes: asan_heap-oob_4d2250_814_cov_2745172097_JACOsub_capability_tester.jss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3d5d95db3f5d8e2093e9e19d0c46e86f54ed2a5d)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=991a2034796b18012f65b53e6bb8ce521c881a36
---

 libavcodec/utils.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ca6fe2d..4e95ab0 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3610,6 +3610,11 @@ int avpriv_bprint_to_extradata(AVCodecContext *avctx, 
struct AVBPrint *buf)
 ret = av_bprint_finalize(buf, &str);
 if (ret < 0)
 return ret;
+if (!av_bprint_is_complete(buf)) {
+av_free(str);
+return AVERROR(ENOMEM);
+}
+
 avctx->extradata = str;
 /* Note: the string is NUL terminated (so extradata can be read as a
  * string), but the ending character is not accounted in the size (in

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/rawdec: Check the return code of avpicture_get_size()

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Wed Nov 
26 18:56:39 2014 +0100| [12e064d6c2ae66bd501872ab4fc2033588419f85] | committer: 
Michael Niedermayer

avcodec/rawdec: Check the return code of avpicture_get_size()

Fixes out of array access
Fixes: asan_heap-oob_22388d0_3435_cov_3297128910_small_roll5_FlashCine1.cine
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 1d3a3b9f8907625b361420d48fe05716859620ff)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e064d6c2ae66bd501872ab4fc2033588419f85
---

 libavcodec/rawdec.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index 28792a1..647dfa9 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -172,6 +172,9 @@ static int raw_decode(AVCodecContext *avctx, void *data, 
int *got_frame,
 context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width,
  avctx->height);
 }
+if (context->frame_size < 0)
+return context->frame_size;
+
 need_copy = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2 || 
context->is_lt_16bpp;
 
 frame->pict_type= AV_PICTURE_TYPE_I;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/pngdec: Check IHDR/IDAT order

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Wed Nov 
26 15:45:47 2014 +0100| [f2595a6c38eeed80cd228c5db142873c95f6b4d3] | committer: 
Michael Niedermayer

avcodec/pngdec: Check IHDR/IDAT order

Fixes out of array access
Fixes: asan_heap-oob_20a6c26_2690_cov_3434532168_mail.png
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 79ceaf827be0b070675d4cd0a55c3386542defd8)

Conflicts:

libavcodec/pngdec.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2595a6c38eeed80cd228c5db142873c95f6b4d3
---

 libavcodec/pngdec.c |6 ++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 835d962..fa7b713 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -582,6 +582,12 @@ static int decode_frame(AVCodecContext *avctx,
 case MKTAG('I', 'H', 'D', 'R'):
 if (length != 13)
 goto fail;
+
+if (s->state & PNG_IDAT) {
+av_log(avctx, AV_LOG_ERROR, "IHDR after IDAT\n");
+goto fail;
+}
+
 s->width  = bytestream2_get_be32(&s->gb);
 s->height = bytestream2_get_be32(&s->gb);
 if (av_image_check_size(s->width, s->height, 0, avctx)) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/hevc_ps: Check return code from pps_range_extensions()

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Thu Nov 
27 02:31:46 2014 +0100| [2ba17ac96c72273f0848cbaf6d73697a68f25277] | committer: 
Michael Niedermayer

avcodec/hevc_ps: Check return code from pps_range_extensions()

Fixes out of array read
Fixes: asan_heap-oob_177e222_885_cov_1532528832_MERGE_D_TI_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 9f9440bd8122cc8798139c9370db0873a24ae14b)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ba17ac96c72273f0848cbaf6d73697a68f25277
---

 libavcodec/hevc_ps.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index 4e1c561..0d6ede2 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -1375,7 +1375,8 @@ int ff_hevc_decode_nal_pps(HEVCContext *s)
 int pps_range_extensions_flag = get_bits1(gb);
 /* int pps_extension_7bits = */ get_bits(gb, 7);
 if (sps->ptl.general_ptl.profile_idc == FF_PROFILE_HEVC_REXT && 
pps_range_extensions_flag) {
-pps_range_extensions(s, pps, sps);
+if ((ret = pps_range_extensions(s, pps, sps)) < 0)
+goto err;
 }
 }
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/mjpegdec: Fix context fields becoming inconsistent

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Tue Nov 
25 13:53:06 2014 +0100| [8524009161b0430ba961a4e6fcd8125a695edd7c] | committer: 
Michael Niedermayer

avcodec/mjpegdec: Fix context fields becoming inconsistent

Fixes out of array access
Fixes: 
asan_heap-oob_1ca4f85_2760_cov_19187_miss_congeniality_pegasus_ljpg.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 0eecf40935b22644e6cd74c586057237ecfd6844)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8524009161b0430ba961a4e6fcd8125a695edd7c
---

 libavcodec/mjpegdec.c |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 2cf55fd..5fdf9be 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1596,6 +1596,8 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
 }
 
 if (id == AV_RB32("LJIF")) {
+int rgb = s->rgb;
+int pegasus_rct = s->pegasus_rct;
 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
 av_log(s->avctx, AV_LOG_INFO,
"Pegasus lossless jpeg header found\n");
@@ -1605,17 +1607,27 @@ static int mjpeg_decode_app(MJpegDecodeContext *s)
 skip_bits(&s->gb, 16); /* unknown always 0? */
 switch (i=get_bits(&s->gb, 8)) {
 case 1:
-s->rgb = 1;
-s->pegasus_rct = 0;
+rgb = 1;
+pegasus_rct = 0;
 break;
 case 2:
-s->rgb = 1;
-s->pegasus_rct = 1;
+rgb = 1;
+pegasus_rct = 1;
 break;
 default:
 av_log(s->avctx, AV_LOG_ERROR, "unknown colorspace %d\n", i);
 }
+
 len -= 9;
+if (s->got_picture)
+if (rgb != s->rgb || pegasus_rct != s->pegasus_rct) {
+av_log(s->avctx, AV_LOG_WARNING, "Mismatching LJIF tag\n");
+goto out;
+}
+
+s->rgb = rgb;
+s->pegasus_rct = pegasus_rct;
+
 goto out;
 }
 if (id == AV_RL32("colr") && len > 0) {

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Mon Nov 
10 23:07:50 2014 +0100| [cfda2a677c25f407fe4a93213e977e4a0106b3ac] | committer: 
Michael Niedermayer

avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization

Fixes out of array read
Fixes: 
asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 5dcb99033df16eccc4dbbc4a099ad64457f9f090)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cfda2a677c25f407fe4a93213e977e4a0106b3ac
---

 libavcodec/wmaprodec.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index f45e1fc..56d6d32 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -422,6 +422,9 @@ static av_cold int decode_init(AVCodecContext *avctx)
 offset &= ~3;
 if (offset > s->sfb_offsets[i][band - 1])
 s->sfb_offsets[i][band++] = offset;
+
+if (offset >= subframe_len)
+break;
 }
 s->sfb_offsets[i][band - 1] = subframe_len;
 s->num_sfb[i]   = band - 1;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] update for 2.4.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Sun Nov 
30 21:59:47 2014 +0100| [5c2d8bbffa218b4d0c7e09d2ecbb2a0a02f665b7] | committer: 
Michael Niedermayer

update for 2.4.4

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c2d8bbffa218b4d0c7e09d2ecbb2a0a02f665b7
---

 RELEASE  |2 +-
 doc/Doxyfile |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE b/RELEASE
index 35cee72..79a6144 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-2.4.3
+2.4.4
diff --git a/doc/Doxyfile b/doc/Doxyfile
index e158951..e8638e3 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME   = FFmpeg
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER = 2.4.3
+PROJECT_NUMBER = 2.4.4
 
 # With the PROJECT_LOGO tag one can specify a logo or icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] swscale: fix yuv2yuvX_8 assembly on x86

[Kieran Kunhya]

ffmpeg | branch: release/2.4 | Kieran Kunhya  | Sun Nov  9 
20:39:35 2014 +0100| [6f580e87350c817ac3176a9e75d158bf3faad4e3] | committer: 
Michael Niedermayer

swscale: fix yuv2yuvX_8 assembly on x86

use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer 
(cherry picked from commit b546023b9319cbaefb638a2eeac56bdbf53d6f8b)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f580e87350c817ac3176a9e75d158bf3faad4e3
---

 libswscale/x86/swscale.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c
index c4c0e28..7c51979 100644
--- a/libswscale/x86/swscale.c
+++ b/libswscale/x86/swscale.c
@@ -425,7 +425,7 @@ switch(c->dstBpc){ \
 case 16:  do_16_case;  
break; \
 case 10: if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_10_ ## opt; 
break; \
 case 9:  if (!isBE(c->dstFormat)) vscalefn = ff_yuv2planeX_9_  ## opt; 
break; \
-default: if (condition_8bit)/*vscalefn = ff_yuv2planeX_8_  ## opt;*/ 
break; \
+case 8: if ((condition_8bit) && !c->use_mmx_vfilter) vscalefn = 
ff_yuv2planeX_8_  ## opt; break; \
 }
 #define ASSIGN_VSCALE_FUNC(vscalefn, opt1, opt2, opt2chk) \
 switch(c->dstBpc){ \

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] libavformat/mxfdec.c: initial support for EssenceGroups

[Mark Reid]

ffmpeg | branch: master | Mark Reid  | Sun Nov 30 12:16:27 
2014 -0800| [e5d217f04899e00b5d6af11fa396242649e75cc1] | committer: Michael 
Niedermayer

libavformat/mxfdec.c: initial support for EssenceGroups

Previous version reviewed-by: Tomas Härdin 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e5d217f04899e00b5d6af11fa396242649e75cc1
---

 libavformat/mxf.c|1 +
 libavformat/mxf.h|1 +
 libavformat/mxfdec.c |  148 +-
 3 files changed, 123 insertions(+), 27 deletions(-)

diff --git a/libavformat/mxf.c b/libavformat/mxf.c
index 4dc54d7..14d143e 100644
--- a/libavformat/mxf.c
+++ b/libavformat/mxf.c
@@ -94,6 +94,7 @@ static const struct {
 {AV_PIX_FMT_RGB565BE,{'R', 5,  'G', 6,  'B', 5 }},
 {AV_PIX_FMT_RGBA,{'R', 8,  'G', 8,  'B', 8, 'A', 8 }},
 {AV_PIX_FMT_PAL8,{'P', 8   }},
+{AV_PIX_FMT_GRAY8,   {'A', 8   }},
 };
 
 static const int num_pixel_layouts = FF_ARRAY_ELEMS(ff_mxf_pixel_layouts);
diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 5b95efa..d9e17c6 100644
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.h
@@ -46,6 +46,7 @@ enum MXFMetadataSetType {
 IndexTableSegment,
 EssenceContainerData,
 TypeBottom,// add metadata type before this
+EssenceGroup,
 };
 
 enum MXFFrameLayout {
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index bc0a10b..8aaf4c3 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -136,6 +136,14 @@ typedef struct {
 typedef struct {
 UID uid;
 enum MXFMetadataSetType type;
+UID *structural_components_refs;
+int structural_components_count;
+int64_t duration;
+} MXFEssenceGroup;
+
+typedef struct {
+UID uid;
+enum MXFMetadataSetType type;
 MXFSequence *sequence; /* mandatory, and only one */
 UID sequence_ref;
 int track_id;
@@ -161,6 +169,7 @@ typedef struct {
 int field_dominance;
 int channels;
 int bits_per_sample;
+int64_t duration; /* ContainerDuration optional property */
 unsigned int component_depth;
 unsigned int horiz_subsampling;
 unsigned int vert_subsampling;
@@ -742,6 +751,25 @@ static int mxf_read_sequence(void *arg, AVIOContext *pb, 
int tag, int size, UID
 return 0;
 }
 
+static int mxf_read_essence_group(void *arg, AVIOContext *pb, int tag, int 
size, UID uid, int64_t klv_offset)
+{
+MXFEssenceGroup *essence_group = arg;
+switch (tag) {
+case 0x0202:
+essence_group->duration = avio_rb64(pb);
+break;
+case 0x0501:
+essence_group->structural_components_count = avio_rb32(pb);
+essence_group->structural_components_refs = 
av_calloc(essence_group->structural_components_count, sizeof(UID));
+if (!essence_group->structural_components_refs)
+return AVERROR(ENOMEM);
+avio_skip(pb, 4); /* useless size of objects, always 16 according to 
specs */
+avio_read(pb, (uint8_t *)essence_group->structural_components_refs, 
essence_group->structural_components_count * sizeof(UID));
+break;
+}
+return 0;
+}
+
 static int mxf_read_utf16_string(AVIOContext *pb, int size, char** str)
 {
 int ret;
@@ -872,7 +900,6 @@ static void mxf_read_pixel_layout(AVIOContext *pb, 
MXFDescriptor *descriptor)
 static int mxf_read_generic_descriptor(void *arg, AVIOContext *pb, int tag, 
int size, UID uid, int64_t klv_offset)
 {
 MXFDescriptor *descriptor = arg;
-descriptor->pix_fmt = AV_PIX_FMT_NONE;
 switch(tag) {
 case 0x3F01:
 descriptor->sub_descriptors_count = avio_rb32(pb);
@@ -882,6 +909,9 @@ static int mxf_read_generic_descriptor(void *arg, 
AVIOContext *pb, int tag, int
 avio_skip(pb, 4); /* useless size of objects, always 16 according to 
specs */
 avio_read(pb, (uint8_t *)descriptor->sub_descriptors_refs, 
descriptor->sub_descriptors_count * sizeof(UID));
 break;
+case 0x3002: /* ContainerDuration */
+descriptor->duration = avio_rb64(pb);
+break;
 case 0x3004:
 avio_read(pb, descriptor->essence_container_ul, 16);
 break;
@@ -994,6 +1024,7 @@ static const MXFCodecUL 
mxf_picture_essence_container_uls[] = {
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x02,0x0d,0x01,0x03,0x01,0x02,0x04,0x60,0x01 
}, 14, AV_CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x02,0x41,0x01 
}, 14,AV_CODEC_ID_DVVIDEO }, /* DV 625 25mbps */
 { { 
0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x05,0x00,0x00 
}, 14,   AV_CODEC_ID_RAWVIDEO }, /* Uncompressed Picture */
+{ { 
0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0xff,0x4b,0x46,0x41,0x41,0x00,0x0d,0x4d,0x4f 
}, 14,   AV_CODEC_ID_RAWVIDEO }, /* Legacy ?? Uncompressed Picture */
 { { 
0x00,0x00,0x00,0x00,0x00,0x00,

[FFmpeg-cvslog] avformat/mxfdec: Reset structural_components_count when allocation fails

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Sun Nov 30 
23:25:19 2014 +0100| [8653419e9d16c9b1e4ecd4221543d919965258a1] | committer: 
Michael Niedermayer

avformat/mxfdec: Reset structural_components_count when allocation fails

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8653419e9d16c9b1e4ecd4221543d919965258a1
---

 libavformat/mxfdec.c |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 8aaf4c3..0c88a8a 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -742,8 +742,10 @@ static int mxf_read_sequence(void *arg, AVIOContext *pb, 
int tag, int size, UID
 case 0x1001:
 sequence->structural_components_count = avio_rb32(pb);
 sequence->structural_components_refs = 
av_calloc(sequence->structural_components_count, sizeof(UID));
-if (!sequence->structural_components_refs)
+if (!sequence->structural_components_refs) {
+sequence->structural_components_count = 0;
 return AVERROR(ENOMEM);
+}
 avio_skip(pb, 4); /* useless size of objects, always 16 according to 
specs */
 avio_read(pb, (uint8_t *)sequence->structural_components_refs, 
sequence->structural_components_count * sizeof(UID));
 break;
@@ -761,8 +763,10 @@ static int mxf_read_essence_group(void *arg, AVIOContext 
*pb, int tag, int size,
 case 0x0501:
 essence_group->structural_components_count = avio_rb32(pb);
 essence_group->structural_components_refs = 
av_calloc(essence_group->structural_components_count, sizeof(UID));
-if (!essence_group->structural_components_refs)
+if (!essence_group->structural_components_refs) {
+essence_group->structural_components_count = 0;
 return AVERROR(ENOMEM);
+}
 avio_skip(pb, 4); /* useless size of objects, always 16 according to 
specs */
 avio_read(pb, (uint8_t *)essence_group->structural_components_refs, 
essence_group->structural_components_count * sizeof(UID));
 break;

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] avformat: replace some odd 30-60 rates by higher less odd ones in get_std_framerate ()

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Fri Nov 
21 12:37:59 2014 +0100| [06336ce760257ae2dbe350cd568a3eb45f48147f] | committer: 
Michael Niedermayer

avformat: replace some odd 30-60 rates by higher less odd ones in  
get_std_framerate()

Fixes Ticket4012

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 367c9d33d6dd1e8a85b63e14464e7e08ee1315cc)

Conflicts:

libavformat/version.h

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=06336ce760257ae2dbe350cd568a3eb45f48147f
---

 libavformat/avformat.h   |2 +-
 libavformat/utils.c  |   12 +---
 tests/ref/fate/cdxl-bitline-ham6 |2 +-
 tests/ref/fate/cdxl-ham8 |2 +-
 tests/ref/fate/cdxl-pal8 |2 +-
 tests/ref/fate/vcr2  |2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index b915148..ebf04f6 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -916,7 +916,7 @@ typedef struct AVStream {
 /**
  * Stream information used internally by av_find_stream_info()
  */
-#define MAX_STD_TIMEBASES (60*12+6)
+#define MAX_STD_TIMEBASES (30*12+7+6)
 struct {
 int64_t last_dts;
 int64_t duration_gcd;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index e899e4d..d9ffaed 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2743,10 +2743,16 @@ static void compute_chapters_end(AVFormatContext *s)
 
 static int get_std_framerate(int i)
 {
-if (i < 60 * 12)
+if (i < 30*12)
 return (i + 1) * 1001;
-else
-return ((const int[]) { 24, 30, 60, 12, 15, 48 })[i - 60 * 12] * 1000 
* 12;
+i -= 30*12;
+
+if (i < 7)
+return ((const int[]) { 40, 48, 50, 60, 80, 120, 240})[i] * 1001 * 12;
+
+i -= 7;
+
+return ((const int[]) { 24, 30, 60, 12, 15, 48 })[i] * 1000 * 12;
 }
 
 /* Is the time base unreliable?
diff --git a/tests/ref/fate/cdxl-bitline-ham6 b/tests/ref/fate/cdxl-bitline-ham6
index 8060f06..9ba7404 100644
--- a/tests/ref/fate/cdxl-bitline-ham6
+++ b/tests/ref/fate/cdxl-bitline-ham6
@@ -1,4 +1,4 @@
-#tb 0: 12/601
+#tb 0: 1/50
 0,  0,  0,1,63180, 0xcda82c16
 0,  1,  1,1,63180, 0xa6097bf9
 0,  2,  2,1,63180, 0x4c2fb091
diff --git a/tests/ref/fate/cdxl-ham8 b/tests/ref/fate/cdxl-ham8
index 269f1f3..1eebea3 100644
--- a/tests/ref/fate/cdxl-ham8
+++ b/tests/ref/fate/cdxl-ham8
@@ -1,2 +1,2 @@
-#tb 0: 3/158
+#tb 0: 12/281
 0,  0,  0,1,67584, 0xce0cade5
diff --git a/tests/ref/fate/cdxl-pal8 b/tests/ref/fate/cdxl-pal8
index 82d4d63..b2fb045 100644
--- a/tests/ref/fate/cdxl-pal8
+++ b/tests/ref/fate/cdxl-pal8
@@ -1,4 +1,4 @@
-#tb 0: 12/601
+#tb 0: 1/50
 0,  0,  0,1,67584, 0x5eae629b
 0,  1,  1,1,67584, 0x32591227
 0,  2,  2,1,67584, 0x4e4424c7
diff --git a/tests/ref/fate/vcr2 b/tests/ref/fate/vcr2
index 521e55f..f7e1540 100644
--- a/tests/ref/fate/vcr2
+++ b/tests/ref/fate/vcr2
@@ -1,4 +1,4 @@
-#tb 0: 16701/25
+#tb 0: 1001/15000
 0,  0,  0,1,38016, 0x50e93e0d
 0,  1,  1,1,38016, 0x6ac8627d
 0,  2,  2,1,38016, 0x6f38661e

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: correct license template for t2h.pm

[Andreas Cadhalpun]

ffmpeg | branch: master | Andreas Cadhalpun  
| Sun Nov 30 23:47:36 2014 +0100| [928322c15f985eb965f0379fbd971d06143763aa] | 
committer: Michael Niedermayer

doc: correct license template for t2h.pm

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=928322c15f985eb965f0379fbd971d06143763aa
---

 doc/t2h.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index 75dc0d3..a927071 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -14,9 +14,9 @@
 # FFmpeg is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
+# General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
+# You should have received a copy of the GNU General Public
 # License along with FFmpeg; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: fix spelling errors

[Andreas Cadhalpun]

ffmpeg | branch: master | Andreas Cadhalpun  
| Sun Nov 30 23:59:22 2014 +0100| [b28652599d78ed47d830af422756ee0dae55c735] | 
committer: Michael Niedermayer

doc: fix spelling errors

succesfully => successfully, reproducable => reproducible, specifiying => 
specifying, isnt => isn't, seperated => separated

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b28652599d78ed47d830af422756ee0dae55c735
---

 doc/codecs.texi|2 +-
 doc/formats.texi   |2 +-
 doc/indevs.texi|2 +-
 doc/print_options.c|2 +-
 libavcodec/avcodec.h   |2 +-
 libavcodec/vdpau.h |2 +-
 libavformat/avformat.h |4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index 35068c7..f1f5c00 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -72,7 +72,7 @@ Force low delay.
 Place global headers in extradata instead of every keyframe.
 @item bitexact
 Only write platform-, build- and time-independent data. (except (I)DCT).
-This ensures that file and data checksums are reproducable and match between
+This ensures that file and data checksums are reproducible and match between
 platforms. Its primary use is for regression testing.
 @item aic
 Apply H263 advanced intra coding / mpeg4 ac prediction.
diff --git a/doc/formats.texi b/doc/formats.texi
index bca8924..4138709 100644
--- a/doc/formats.texi
+++ b/doc/formats.texi
@@ -57,7 +57,7 @@ Enable RTP MP4A-LATM payload.
 Reduce the latency introduced by optional buffering
 @item bitexact
 Only write platform-, build- and time-independent data.
-This ensures that file and data checksums are reproducable and match between
+This ensures that file and data checksums are reproducible and match between
 platforms. Its primary use is for regression testing.
 @end table
 
diff --git a/doc/indevs.texi b/doc/indevs.texi
index 5d2a308..ad823ab 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -86,7 +86,7 @@ Select the AVFoundation default device of the corresponding 
type.
 
 @item none
 Do not record the corresponding media type.
-This is equivalent to specifiying an empty device name or index.
+This is equivalent to specifying an empty device name or index.
 
 @end table
 
diff --git a/doc/print_options.c b/doc/print_options.c
index b225e69..9fd66ca 100644
--- a/doc/print_options.c
+++ b/doc/print_options.c
@@ -26,7 +26,7 @@
 #include 
 #include 
 
-// print_options is build for the host, os_support.h isnt needed and is setup
+// print_options is build for the host, os_support.h isn't needed and is setup
 // for the target. without this build breaks on mingw
 #define AVFORMAT_OS_SUPPORT_H
 
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3323284..dabae1b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3115,7 +3115,7 @@ typedef struct AVCodecContext {
 uint8_t *dump_separator;
 
 /**
- * ',' seperated list of allowed decoders.
+ * ',' separated list of allowed decoders.
  * If NULL then all are allowed
  * - encoding: unused
  * - decoding: set by user through AVOPtions (NO direct access)
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index d686ef4..1006779 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -157,7 +157,7 @@ void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, 
AVVDPAU_Render2);
  * display preemption).
  *
  * @note get_format() must return AV_PIX_FMT_VDPAU if this function completes
- * succesfully.
+ * successfully.
  *
  * @param avctx decoding context whose get_format() callback is invoked
  * @param device VDPAU device handle to use for hardware acceleration
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 3d99f37..2e54ed1 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -1601,7 +1601,7 @@ typedef struct AVFormatContext {
 int format_probesize;
 
 /**
- * ',' seperated list of allowed decoders.
+ * ',' separated list of allowed decoders.
  * If NULL then all are allowed
  * - encoding: unused
  * - decoding: set by user through AVOptions (NO direct access)
@@ -1609,7 +1609,7 @@ typedef struct AVFormatContext {
 char *codec_whitelist;
 
 /**
- * ',' seperated list of allowed demuxers.
+ * ',' separated list of allowed demuxers.
  * If NULL then all are allowed
  * - encoding: unused
  * - decoding: set by user through AVOptions (NO direct access)

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] doc: correct license template for t2h.pm

[Andreas Cadhalpun]

ffmpeg | branch: release/2.4 | Andreas Cadhalpun 
 | Sun Nov 30 23:47:36 2014 +0100| 
[883f3e18ddcc64129f25f43d73a82313a5031f78] | committer: Michael Niedermayer

doc: correct license template for t2h.pm

Signed-off-by: Michael Niedermayer 
(cherry picked from commit 928322c15f985eb965f0379fbd971d06143763aa)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=883f3e18ddcc64129f25f43d73a82313a5031f78
---

 doc/t2h.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/t2h.pm b/doc/t2h.pm
index 75dc0d3..a927071 100644
--- a/doc/t2h.pm
+++ b/doc/t2h.pm
@@ -14,9 +14,9 @@
 # FFmpeg is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
+# General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
+# You should have received a copy of the GNU General Public
 # License along with FFmpeg; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] fix Makefile objects for pulseaudio support

[Michael Stypa]

ffmpeg | branch: release/2.3 | Michael Stypa  | Fri Nov 28 
15:54:50 2014 +0100| [0cc15f7c83aaab159830ecc04b74438d0819c4ef] | committer: 
Carl Eugen Hoyos

fix Makefile objects for pulseaudio support

Signed-off-by: Michael Niedermayer 
(cherry picked from commit cb58c771ade66afcc623250e1c7ac8191381d991)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cc15f7c83aaab159830ecc04b74438d0819c4ef
---

 libavdevice/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 767df19..d6207f9 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -34,7 +34,7 @@ OBJS-$(CONFIG_OPENGL_OUTDEV) += opengl_enc.o
 OBJS-$(CONFIG_OSS_INDEV) += oss_audio.o
 OBJS-$(CONFIG_OSS_OUTDEV)+= oss_audio.o
 OBJS-$(CONFIG_PULSE_INDEV)   += pulse_audio_dec.o \
-pulse_audio_common.o
+pulse_audio_common.o timefilter.o
 OBJS-$(CONFIG_PULSE_OUTDEV)  += pulse_audio_enc.o \
 pulse_audio_common.o
 OBJS-$(CONFIG_QTKIT_INDEV)   += qtkit.o

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Changelog: update for 2.4.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer  | Mon Dec 
 1 02:11:00 2014 +0100| [dd2394754d8cee3717b3e198c83cc382674cf126] | committer: 
Michael Niedermayer

Changelog: update for 2.4.4

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dd2394754d8cee3717b3e198c83cc382674cf126
---

 Changelog |   37 +
 1 file changed, 37 insertions(+)

diff --git a/Changelog b/Changelog
index 1002a0f..28fe41f 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,43 @@ releases are sorted from youngest to oldest.
 
 version :
 
+version 2.4.4:
+- avformat: replace some odd 30-60 rates by higher less odd ones in  
get_std_framerate()
+- swscale: fix yuv2yuvX_8 assembly on x86
+- avcodec/hevc_ps: Check num_long_term_ref_pics_sps
+- avcodec/mjpegdec: Fix integer overflow in shift
+- avcodec/hevc_ps: Check return code from pps_range_extensions()
+- avcodec/rawdec: Check the return code of avpicture_get_size()
+- avcodec/pngdec: Check IHDR/IDAT order
+- avcodec/flacdec: Call ff_flacdsp_init() unconditionally
+- avcodec/utils: Check that the data is complete in 
avpriv_bprint_to_extradata()
+- avcodec/mjpegdec: Fix context fields becoming inconsistent
+- avcodec/mjpegdec: Check for pixfmtid 0x4200 || 0x2400 with more than 
8 bits
+- swscale/x86/rgb2rgb_template: handle the first 2 lines with C in 
rgb24toyv12_*()
+- doc/APIchanges: Fix some wrong versions
+- avformat/hlsenc: Free context after hls_append_segment
+- avcodec/mpeg4video_parser: fix spurious extradata parse warnings
+- lavu/opt: fix av_opt_get function
+- avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization
+- avcodec/utvideodec: fix assumtation that slice_height >= 1
+- avcodec/options_table fix min of audio channels and sample rate
+- libavutil/thread.h: Support OS/2 threads
+- fix Makefile objects for pulseaudio support
+- opusdec: make sure all substreams have the same number of coded samples
+- lavu: add wrappers for the pthreads mutex API
+- avformat/avidec: fix handling dv in avi
+- avfilter/vf_lut: gammaval709()
+- cinedec: report white balance gain coefficients using metadata
+- swscale/utils: support bayer input + scaling, and bayer input + any 
supported output
+- swscale: support internal scaler cascades
+- avformat/dtsdec: dts_probe: check reserved bit, check lfe, check sr_code 
similarity
+- avformat/segment: export inner muxer timebase
+- Remove fminf() emulation, fix build issues
+- avcodec/mpegaudio_parser: fix off by 1 error in bitrate calculation
+- Use -fno-optimize-sibling-calls on parisc also for gcc 4.9.
+- ffmpeg_opt: store canvas size in decoder context
+- avcodec/mpeg12dec: do not trust AVCodecContext input dimensions
+
 version 2.4.3:
 - avcodec/svq1dec: zero terminate embedded message before printing
 - avcodec/cook: check that the subpacket sizes fit in block_align

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] Tag n2.4.4 : FFmpeg 2.4.4 release

[git]

[ffmpeg] [branch: refs/tags/n2.4.4]
Tag:4e512a8eff0e4828812b65e82467a5e8584b26a3
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=4e512a8eff0e4828812b65e82467a5e8584b26a3

Tagger: Michael Niedermayer 
Date:   Mon Dec  1 02:35:52 2014 +0100

FFmpeg 2.4.4 release
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 9bd47b9 web/download: add FFmpeg 2.4.4

[gitolite]

The branch, master has been updated
   via  9bd47b91275d231f829f02d54a812011c13a341b (commit)
  from  5a5911b80b7a40f1ac0b03d3ff850375d3af1897 (commit)


- Log -
commit 9bd47b91275d231f829f02d54a812011c13a341b
Author: Michael Niedermayer 
AuthorDate: Mon Dec 1 02:39:32 2014 +0100
Commit: Michael Niedermayer 
CommitDate: Mon Dec 1 02:39:32 2014 +0100

web/download: add FFmpeg 2.4.4

diff --git a/src/download b/src/download
index f3f9ce3..ad71bd8 100644
--- a/src/download
+++ b/src/download
@@ -1,10 +1,10 @@
 
 
   
-http://ffmpeg.org/releases/ffmpeg-2.4.3.tar.bz2"; class="btn 
btn-success">
+http://ffmpeg.org/releases/ffmpeg-2.4.4.tar.bz2"; class="btn 
btn-success">
   
   Download
-  ffmpeg-2.4.3.tar.bz2
+  ffmpeg-2.4.4.tar.bz2
 
 
 More releases
@@ -276,13 +276,13 @@
 
 
   
-FFmpeg 2.4.3 "Fresnel"
+FFmpeg 2.4.4 "Fresnel"
 
   
-2.4.3 was released on 2014-11-02. It is the latest stable FFmpeg release
+2.4.4 was released on 2014-12-01. It is the latest stable FFmpeg release
 from the 2.4 release branch, which was cut from master on 2014-09-14.
 Amongst lots of other changes, it includes all changes from
-ffmpeg-mt, libav master of 2014-09-14, libav 11 as of 2014-11-01.
+ffmpeg-mt, libav master of 2014-09-14, libav 11 as of 2014-11-30.
   
   It includes the following library versions:
   
@@ -299,15 +299,15 @@ libpostproc53.  0.100
 
   
 
-  Download 
bzip2 tarball
-  PGP 
signature
+  Download 
bzip2 tarball
+  PGP 
signature
  
 
-  Download 
gzip tarball
-  PGP 
signature
+  Download 
gzip tarball
+  PGP 
signature
  
 
-  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.4.3";>Changelog
+  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.4.4";>Changelog
   http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.4";>Release
 Notes
  


---

Summary of changes:
 src/download |   20 ++--
 1 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog