[FFmpeg-cvslog] avfilter/vf_mp: remove incorrect usage of AVFrame.type

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat Aug 30 
12:16:46 2014 +0200| [0daff3ce76329f107e2ca2e893c3c456b5873c77] | committer: 
Michael Niedermayer

avfilter/vf_mp: remove incorrect usage of AVFrame.type

Signed-off-by: Michael Niedermayer 

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

 libavfilter/vf_mp.c |2 --
 1 file changed, 2 deletions(-)

diff --git a/libavfilter/vf_mp.c b/libavfilter/vf_mp.c
index 9f0fbf6..9264e9b 100644
--- a/libavfilter/vf_mp.c
+++ b/libavfilter/vf_mp.c
@@ -474,8 +474,6 @@ int ff_vf_next_put_image(struct vf_instance *vf,mp_image_t 
*mpi, double pts){
 picref->width  = mpi->w;
 picref->height = mpi->h;
 
-picref->type = AVMEDIA_TYPE_VIDEO;
-
 for(i=0; conversion_map[i].fmt && mpi->imgfmt != conversion_map[i].fmt; 
i++);
 picref->format = conversion_map[i].pix_fmt;
 

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

[FFmpeg-cvslog] avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat Aug 30 
12:21:07 2014 +0200| [19bf1ed1f4263346ec67b7a8271b9b6351c8a011] | committer: 
Michael Niedermayer

avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib 
is unavailable

Signed-off-by: Michael Niedermayer 

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

 libavformat/id3v2.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index fb89e83..5469e0a 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -676,7 +676,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary 
**metadata,
 int buffer_size   = 0;
 const ID3v2EMFunc *extra_func = NULL;
 unsigned char *uncompressed_buffer = NULL;
-int uncompressed_buffer_size = 0;
+av_unused int uncompressed_buffer_size = 0;
 
 av_log(s, AV_LOG_DEBUG, "id3v2 ver:%d flags:%02X len:%d\n", version, 
flags, len);
 

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

[FFmpeg-cvslog] avcodec/aarch64/h264qpel_init_aarch64: mark src as const

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat Aug 30 
12:48:31 2014 +0200| [e16b7338d8777618936ff6ab9133e19f4db9069c] | committer: 
Michael Niedermayer

avcodec/aarch64/h264qpel_init_aarch64: mark src as const

Signed-off-by: Michael Niedermayer 

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

 libavcodec/aarch64/h264qpel_init_aarch64.c |  128 ++--
 1 file changed, 64 insertions(+), 64 deletions(-)

diff --git a/libavcodec/aarch64/h264qpel_init_aarch64.c 
b/libavcodec/aarch64/h264qpel_init_aarch64.c
index 0578c01..77f41d9 100644
--- a/libavcodec/aarch64/h264qpel_init_aarch64.c
+++ b/libavcodec/aarch64/h264qpel_init_aarch64.c
@@ -27,73 +27,73 @@
 #include "libavutil/aarch64/cpu.h"
 #include "libavcodec/h264qpel.h"
 
-void ff_put_h264_qpel16_mc00_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc10_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc20_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc30_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc01_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc11_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc21_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc31_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc02_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc12_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc22_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc32_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc03_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc13_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc23_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
-void ff_put_h264_qpel16_mc33_neon(uint8_t *dst, uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc00_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc10_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc20_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc30_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc01_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc11_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc21_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc31_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc02_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc12_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc22_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc32_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc03_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc13_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc23_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel16_mc33_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
 
-void ff_put_h264_qpel8_mc00_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc10_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc20_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc30_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc01_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc11_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc21_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc31_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc02_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc12_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc22_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc32_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc03_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc13_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc23_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
-void ff_put_h264_qpel8_mc33_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride);
+void ff_put_h264_qpel8_mc00_neon(uint8_t *dst, const uint8_t *src, ptrdiff_t 
stride);
+void ff_put_h264_qpel8_mc10_neon(uint8_t *dst

[FFmpeg-cvslog] avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat Aug 30 
12:42:16 2014 +0200| [97cebf3139ccb0988927657cf16c3ca9c75996c6] | committer: 
Michael Niedermayer

avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/udp.c b/libavformat/udp.c
index e87cd14..376a544 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -784,9 +784,9 @@ static int udp_read(URLContext *h, uint8_t *buf, int size)
 {
 UDPContext *s = h->priv_data;
 int ret;
+#if HAVE_PTHREAD_CANCEL
 int avail, nonblock = h->flags & AVIO_FLAG_NONBLOCK;
 
-#if HAVE_PTHREAD_CANCEL
 if (s->fifo) {
 pthread_mutex_lock(&s->mutex);
 do {
@@ -863,13 +863,13 @@ static int udp_write(URLContext *h, const uint8_t *buf, 
int size)
 static int udp_close(URLContext *h)
 {
 UDPContext *s = h->priv_data;
-int ret;
 
 if (s->is_multicast && (h->flags & AVIO_FLAG_READ))
 udp_leave_multicast_group(s->udp_fd, (struct sockaddr 
*)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage);
 closesocket(s->udp_fd);
 #if HAVE_PTHREAD_CANCEL
 if (s->thread_started) {
+int ret;
 pthread_cancel(s->circular_buffer_thread);
 ret = pthread_join(s->circular_buffer_thread, NULL);
 if (ret != 0)

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

[FFmpeg-cvslog] avcodec/vp3data: use more compact data types

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat Aug 30 
05:10:26 2014 +0200| [1402873601103fd0902db9aac65561e4fe1aa274] | committer: 
Michael Niedermayer

avcodec/vp3data: use more compact data types

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 

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

 libavcodec/vp3data.h |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h
index 427827b..da31f6d 100644
--- a/libavcodec/vp3data.h
+++ b/libavcodec/vp3data.h
@@ -26,7 +26,7 @@
 
 /* these coefficients dequantize intraframe Y plane coefficients
  * (note: same as JPEG) */
-static const int16_t vp31_intra_y_dequant[64] = {
+static const int8_t vp31_intra_y_dequant[64] = {
 16, 11, 10, 16,  24,  40,  51,  61,
 12, 12, 14, 19,  26,  58,  60,  55,
 14, 13, 16, 24,  40,  57,  69,  56,
@@ -39,7 +39,7 @@ static const int16_t vp31_intra_y_dequant[64] = {
 
 /* these coefficients dequantize intraframe C plane coefficients
  * (note: same as JPEG) */
-static const int16_t vp31_intra_c_dequant[64] = {
+static const int8_t vp31_intra_c_dequant[64] = {
 17, 18, 24, 47, 99, 99, 99, 99,
 18, 21, 26, 66, 99, 99, 99, 99,
 24, 26, 56, 99, 99, 99, 99, 99,
@@ -51,7 +51,7 @@ static const int16_t vp31_intra_c_dequant[64] = {
 };
 
 /* these coefficients dequantize interframe coefficients (all planes) */
-static const int16_t vp31_inter_dequant[64] = {
+static const int8_t vp31_inter_dequant[64] = {
 16, 16, 16, 20, 24, 28,  32,  40,
 16, 16, 20, 24, 28, 32,  40,  48,
 16, 20, 24, 28, 32, 40,  48,  64,
@@ -62,7 +62,7 @@ static const int16_t vp31_inter_dequant[64] = {
 40, 48, 64, 64, 64, 96, 128, 128
 };
 
-static const int16_t vp31_dc_scale_factor[64] = {
+static const uint8_t vp31_dc_scale_factor[64] = {
 220, 200, 190, 180, 170, 170, 160, 160,
 150, 150, 140, 140, 130, 130, 120, 120,
 110, 110, 100, 100,  90,  90,  90,  80,
@@ -176,7 +176,7 @@ static const uint8_t motion_vector_vlc_table[63][2] = {
 { 0xFC, 8 }, { 0xFD, 8 }, { 0xFE, 8 }, { 0xFF, 8 }
 };
 
-static const int motion_vector_table[63] = {
+static const int8_t motion_vector_table[63] = {
  0,   1, -1,
  2,  -2,
  3,  -3,
@@ -198,21 +198,21 @@ static const int8_t fixed_motion_vector_table[64] = {
 };
 
 /* only tokens 0..6 indicate eob runs */
-static const int eob_run_base[7] = {
+static const uint8_t eob_run_base[7] = {
 1, 2, 3, 4, 8, 16, 0
 };
-static const int eob_run_get_bits[7] = {
+static const uint8_t eob_run_get_bits[7] = {
 0, 0, 0, 2, 3, 4, 12
 };
 
-static const int zero_run_base[32] = {
+static const uint8_t zero_run_base[32] = {
 0,  0, 0, 0, 0, 0, 0,   /* 0..6 are never used */
 0,  0,  /* 7..8 */
 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9..22 */
 1,  2, 3, 4, 5, /* 23..27 */
 6, 10, 1, 2 /* 28..31 */
 };
-static const int zero_run_get_bits[32] = {
+static const uint8_t zero_run_get_bits[32] = {
 0, 0, 0, 0, 0, 0, 0,/* 0..6 are never used */
 3, 6,   /* 7..8 */
 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 9..22 */
@@ -220,7 +220,7 @@ static const int zero_run_get_bits[32] = {
 2, 3, 0, 1  /* 28..31 */
 };
 
-static const int coeff_get_bits[32] = {
+static const uint8_t coeff_get_bits[32] = {
 0, 0, 0, 0, 0, 0, 0,/* 0..6 are never used */
 0, 0, 0, 0, 0, 0,   /* 7..12 use constant coeffs */
 1, 1, 1, 1, /* 13..16 are constants but still need sign bit */

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

[FFmpeg-cvslog] proresenc_ks: allow auto-selecting profile

2014-08-30 Thread Christophe Gisquet 
ffmpeg | branch: master | Christophe Gisquet  | 
Mon Aug 18 11:27:50 2014 +0200| [a808733675ccfaf19e923477b18c1ad15be4dd67] | 
committer: Michael Niedermayer

proresenc_ks: allow auto-selecting profile

The user may not know how to select the profile, nor what he needs, in
particular to encode alpha.

Therefore, use an automatic selection as default, and warn when the
manually selected profile may cause issues.

Signed-off-by: Michael Niedermayer 

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

 libavcodec/proresenc_kostya.c |   21 +++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c
index c30c9c0..9f7c03e 100644
--- a/libavcodec/proresenc_kostya.c
+++ b/libavcodec/proresenc_kostya.c
@@ -40,6 +40,7 @@
 #define MAX_PLANES 4
 
 enum {
+PRORES_PROFILE_AUTO  = -1,
 PRORES_PROFILE_PROXY = 0,
 PRORES_PROFILE_LT,
 PRORES_PROFILE_STANDARD,
@@ -1146,7 +1147,21 @@ static av_cold int encode_init(AVCodecContext *avctx)
"there should be an integer power of two MBs per slice\n");
 return AVERROR(EINVAL);
 }
+if (ctx->profile == PRORES_PROFILE_AUTO) {
+ctx->profile = av_pix_fmt_desc_get(avctx->pix_fmt)->flags & 
AV_PIX_FMT_FLAG_ALPHA
+ ? PRORES_PROFILE_ : PRORES_PROFILE_HQ;
+av_log(avctx, AV_LOG_INFO, "Autoselected %s. It can be overridden "
+   "through -profile option.\n", ctx->profile == 
PRORES_PROFILE_
+   ? "4:4:4:4 profile because of the alpha channel"
+   : "HQ profile to keep best quality");
+}
 if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_ALPHA) {
+if (ctx->profile != PRORES_PROFILE_) {
+// force alpha and warn
+av_log(avctx, AV_LOG_WARNING, "Profile selected will not "
+   "encode alpha. Override with -profile if needed.\n");
+ctx->alpha_bits = 0;
+}
 if (ctx->alpha_bits & 7) {
 av_log(avctx, AV_LOG_ERROR, "alpha bits should be 0, 8 or 16\n");
 return AVERROR(EINVAL);
@@ -1280,8 +1295,10 @@ static const AVOption options[] = {
 { "mbs_per_slice", "macroblocks per slice", OFFSET(mbs_per_slice),
 AV_OPT_TYPE_INT, { .i64 = 8 }, 1, MAX_MBS_PER_SLICE, VE },
 { "profile",   NULL, OFFSET(profile), AV_OPT_TYPE_INT,
-{ .i64 = PRORES_PROFILE_STANDARD },
-PRORES_PROFILE_PROXY, PRORES_PROFILE_, VE, "profile" },
+{ .i64 = PRORES_PROFILE_AUTO },
+PRORES_PROFILE_AUTO, PRORES_PROFILE_, VE, "profile" },
+{ "auto", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_AUTO 
},
+0, 0, VE, "profile" },
 { "proxy", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 
PRORES_PROFILE_PROXY },
 0, 0, VE, "profile" },
 { "lt",NULL, 0, AV_OPT_TYPE_CONST, { .i64 = PRORES_PROFILE_LT 
},

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

[FFmpeg-cvslog] lavf/rtpdec_hevc: Fix compilation with -DDEBUG.

2014-08-30 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Aug 30 
12:33:28 2014 +0200| [f22c24bd7a57eca27ccc400dbb334b20db5fb050] | committer: 
Carl Eugen Hoyos

lavf/rtpdec_hevc: Fix compilation with -DDEBUG.

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

 libavformat/rtpdec_hevc.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c
index 2cc76dc..4504e12 100644
--- a/libavformat/rtpdec_hevc.c
+++ b/libavformat/rtpdec_hevc.c
@@ -128,7 +128,7 @@ static av_cold int 
hevc_sdp_parse_fmtp_config(AVFormatContext *s,
 hevc_data->using_donl_field = 1;
 
 #ifdef DEBUG
-av_log(s, AV_LOG_DEBUG, "SDP: found sprop-max-don-diff in SDP, DON 
field usage is: %d\n", hevc_data->using_dons);
+av_log(s, AV_LOG_DEBUG, "SDP: found sprop-max-don-diff in SDP, DON 
field usage is: %d\n", hevc_data->using_donl_field);
 #endif
 }
 
@@ -138,7 +138,7 @@ static av_cold int 
hevc_sdp_parse_fmtp_config(AVFormatContext *s,
 hevc_data->using_donl_field = 1;
 
 #ifdef DEBUG
-av_log(s, AV_LOG_DEBUG, "SDP: found sprop-depack-buf-nalus in SDP, DON 
field usage is: %d\n", hevc_data->using_dons);
+av_log(s, AV_LOG_DEBUG, "SDP: found sprop-depack-buf-nalus in SDP, DON 
field usage is: %d\n", hevc_data->using_donl_field);
 #endif
 }
 
@@ -295,7 +295,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, 
PayloadContext *rtp_hevc_ctx
 /* A/V packet: copy NAL unit data */
 memcpy(pkt->data + sizeof(start_sequence), buf, len);
 
-COUNT_HEVC_NAL_TYPE(data, nal_type);
+COUNT_HEVC_NAL_TYPE(rtp_hevc_ctx, nal_type);
 
 break;
 /* fragmentation unit (FU) */
@@ -367,7 +367,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, 
PayloadContext *rtp_hevc_ctx
 }
 
 if(!res){
-COUNT_HEVC_NAL_TYPE(data, fu_type);
+COUNT_HEVC_NAL_TYPE(rtp_hevc_ctx, fu_type);
 }
 
 break;

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

[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat Aug 30 
14:38:40 2014 +0200| [ce36d80881132d3ddb7d2d859a604106cf7e92d4] | committer: 
Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

2014-08-30 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Sat Aug 30 
12:27:50 2014 +0200| [494cbc4238db4db1f3bd2104e15bee4498b40cb4] | committer: 
Carl Eugen Hoyos

ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Fixes ticket #3858.

Reviewed-by: Nicolas George

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

 ffmpeg_filter.c |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c
index b6dc42f..7acff28 100644
--- a/ffmpeg_filter.c
+++ b/ffmpeg_filter.c
@@ -898,8 +898,11 @@ int configure_filtergraph(FilterGraph *fg)
 init_input_filter(fg, cur);
 
 for (cur = inputs, i = 0; cur; cur = cur->next, i++)
-if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0)
+if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0) {
+avfilter_inout_free(&inputs);
+avfilter_inout_free(&outputs);
 return ret;
+}
 avfilter_inout_free(&inputs);
 
 if (!init || simple) {

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

[FFmpeg-cvslog] fft: add missing const.

2014-08-30 Thread Reimar Döffinger 
ffmpeg | branch: master | Reimar Döffinger  | Fri Aug 
29 18:23:52 2014 +0200| [e2cd28c9265e21b1eeeceaece1da4109712e7555] | committer: 
Reimar Döffinger

fft: add missing const.

This table was the largest object in FFmpeg's .data,
and really should be in .rodata.

Signed-off-by: Reimar Döffinger 

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

 libavcodec/fft_init_table.c |2 +-
 libavcodec/fft_table.h  |2 +-
 libavcodec/fft_template.c   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/fft_init_table.c b/libavcodec/fft_init_table.c
index 7511dbe..4e8b082 100644
--- a/libavcodec/fft_init_table.c
+++ b/libavcodec/fft_init_table.c
@@ -53,7 +53,7 @@
  */
 #include "libavcodec/fft_table.h"
 
-int32_t w_tab_sr[MAX_FFT_SIZE/(4*16)] = {
+const int32_t 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,
diff --git a/libavcodec/fft_table.h b/libavcodec/fft_table.h
index 7f3142d..4cd3a45 100644
--- a/libavcodec/fft_table.h
+++ b/libavcodec/fft_table.h
@@ -59,7 +59,7 @@
 #define MAX_LOG2_NFFT 16 //!< Specifies maximum allowed fft size
 #define MAX_FFT_SIZE (1 << MAX_LOG2_NFFT)
 
-extern int32_t w_tab_sr[];
+extern const int32_t w_tab_sr[];
 extern uint16_t fft_offsets_lut[];
 void ff_fft_lut_init(uint16_t *table, int off, int size, int *index);
 
diff --git a/libavcodec/fft_template.c b/libavcodec/fft_template.c
index b8d6417..697d1fc 100644
--- a/libavcodec/fft_template.c
+++ b/libavcodec/fft_template.c
@@ -229,7 +229,7 @@ static void fft_calc_c(FFTContext *s, FFTComplex *z) {
 FFTSample tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
 FFTComplex *tmpz;
 FFTSample w_re, w_im;
-FFTSample *w_re_ptr, *w_im_ptr;
+const FFTSample *w_re_ptr, *w_im_ptr;
 const int fft_size = (1 << s->nbits);
 int64_t accu;
 

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

[FFmpeg-cvslog] oggdec: fix invalid free on error

2014-08-30 Thread wm4 
ffmpeg | branch: master | wm4  | Sat Aug 30 15:39:15 
2014 +0200| [b173f5c15572cc82f68128599722e689df4ff137] | committer: Michael 
Niedermayer

oggdec: fix invalid free on error

The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer 

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

 libavformat/oggdec.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index f17393b..8f146e4 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -817,7 +817,6 @@ retry:
 return psize;
 fail:
 av_free_packet(pkt);
-av_free(pkt);
 return AVERROR(ENOMEM);
 }
 

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

[FFmpeg-cvslog] avformat/dfa: use avio_feof()

2014-08-30 Thread Paul B Mahol 
ffmpeg | branch: master | Paul B Mahol  | Sun Aug 24 14:28:02 
2014 +| [bd6f1458207788254d0d160052d9b0113e9c4ec2] | committer: Paul B Mahol

avformat/dfa: use avio_feof()

Signed-off-by: Paul B Mahol 

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

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

diff --git a/libavformat/dfa.c b/libavformat/dfa.c
index dfa0590..450bc21 100644
--- a/libavformat/dfa.c
+++ b/libavformat/dfa.c
@@ -84,12 +84,12 @@ static int dfa_read_packet(AVFormatContext *s, AVPacket 
*pkt)
 uint32_t frame_size;
 int ret, first = 1;
 
-if (pb->eof_reached)
+if (avio_feof(pb))
 return AVERROR_EOF;
 
 if (av_get_packet(pb, pkt, 12) != 12)
 return AVERROR(EIO);
-while (!pb->eof_reached) {
+while (!avio_feof(pb)) {
 if (!first) {
 ret = av_append_packet(pb, pkt, 12);
 if (ret < 0) {

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

[FFmpeg-cvslog] xv.c: Add missing const to lookup table.

2014-08-30 Thread Reimar Döffinger 
ffmpeg | branch: master | Reimar Döffinger  | Fri Aug 
29 18:44:22 2014 +0200| [8c63a0d171142329bd215c77c29cc38f91366ae0] | committer: 
Reimar Döffinger

xv.c: Add missing const to lookup table.

Signed-off-by: Reimar Döffinger 

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

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

diff --git a/libavdevice/xv.c b/libavdevice/xv.c
index aeb3e41..c19c15c 100644
--- a/libavdevice/xv.c
+++ b/libavdevice/xv.c
@@ -67,7 +67,7 @@ typedef struct XVTagFormatMap
 enum AVPixelFormat format;
 } XVTagFormatMap;
 
-static XVTagFormatMap tag_codec_map[] = {
+static const XVTagFormatMap tag_codec_map[] = {
 { MKTAG('I','4','2','0'), AV_PIX_FMT_YUV420P },
 { MKTAG('U','Y','V','Y'), AV_PIX_FMT_UYVY422 },
 { MKTAG('Y','U','Y','2'), AV_PIX_FMT_YUYV422 },
@@ -76,7 +76,7 @@ static XVTagFormatMap tag_codec_map[] = {
 
 static int xv_get_tag_from_format(enum AVPixelFormat format)
 {
-XVTagFormatMap *m = tag_codec_map;
+const XVTagFormatMap *m = tag_codec_map;
 int i;
 for (i = 0; m->tag; m = &tag_codec_map[++i]) {
 if (m->format == format)

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

[FFmpeg-cvslog] mpegts: Do not try to write a PMT larger than SECTION_SIZE

2014-08-30 Thread Luca Barbato 
ffmpeg | branch: release/1.1 | Luca Barbato  | Thu Aug  7 
17:10:32 2014 +0200| [addbaf134836aea4e14f73add8c6d753a1373257] | committer: 
Luca Barbato

mpegts: Do not try to write a PMT larger than SECTION_SIZE

Prevent out of array write.

Similar to what Michael Niedermayer did to address the same issue.

Bug-Id: CVE-2014-2263
CC: libav-sta...@libav.org

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

 libavformat/mpegtsenc.c |   24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 86fc631..c0b17a8 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -254,7 +254,7 @@ static void mpegts_write_pmt(AVFormatContext *s, 
MpegTSService *service)
 {
 MpegTSWrite *ts = s->priv_data;
 uint8_t data[SECTION_LENGTH], *q, *desc_length_ptr, 
*program_info_length_ptr;
-int val, stream_type, i;
+int val, stream_type, i, err = 0;
 
 q = data;
 put16(&q, 0xe000 | service->pcr_pid);
@@ -272,6 +272,11 @@ static void mpegts_write_pmt(AVFormatContext *s, 
MpegTSService *service)
 AVStream *st = s->streams[i];
 MpegTSWriteStream *ts_st = st->priv_data;
 AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", 
NULL,0);
+
+if (q - data > SECTION_LENGTH - 3 - 2 - 6) {
+err = 1;
+break;
+}
 switch(st->codec->codec_id) {
 case AV_CODEC_ID_MPEG1VIDEO:
 case AV_CODEC_ID_MPEG2VIDEO:
@@ -321,6 +326,10 @@ static void mpegts_write_pmt(AVFormatContext *s, 
MpegTSService *service)
 *len_ptr = 0;
 
 for (p = lang->value; next && *len_ptr < 255 / 4 * 4; p = next 
+ 1) {
+if (q - data > SECTION_LENGTH - 4) {
+err = 1;
+break;
+}
 next = strchr(p, ',');
 if (strlen(p) != 3 && (!next || next != p + 3))
 continue; /* not a 3-letter code */
@@ -355,6 +364,11 @@ static void mpegts_write_pmt(AVFormatContext *s, 
MpegTSService *service)
 *q++ = language[1];
 *q++ = language[2];
 *q++ = 0x10; /* normal subtitles (0x20 = if hearing pb) */
+
+if (q - data > SECTION_LENGTH - 4) {
+err = 1;
+break;
+}
 if(st->codec->extradata_size == 4) {
 memcpy(q, st->codec->extradata, 4);
 q += 4;
@@ -380,6 +394,14 @@ static void mpegts_write_pmt(AVFormatContext *s, 
MpegTSService *service)
 desc_length_ptr[0] = val >> 8;
 desc_length_ptr[1] = val;
 }
+
+if (err)
+av_log(s, AV_LOG_ERROR,
+   "The PMT section is too small for stream %d and following.\n"
+   "Try reducing the number of languages in the audio streams "
+   "or the total number of streams.\n",
+   i);
+
 mpegts_write_section1(&service->pmt, PMT_TID, service->sid, 0, 0, 0,
   data, q - data);
 }

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

[FFmpeg-cvslog] mpegts: Define the section length with a constant

2014-08-30 Thread Luca Barbato 
ffmpeg | branch: release/1.1 | Luca Barbato  | Sun Aug  3 
19:27:07 2014 +0200| [694b7cd873f8b06af109036eff1ccd741afdd28e] | committer: 
Luca Barbato

mpegts: Define the section length with a constant

The specification says the value is expressed in 10 bits including
the 4-byte CRC.

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

 libavformat/mpegtsenc.c |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index 29d83c6..86fc631 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -122,6 +122,10 @@ static const AVClass mpegts_muxer_class = {
 .version= LIBAVUTIL_VERSION_INT,
 };
 
+/* The section length is 12 bits. The first 2 are set to 0, the remaining
+ * 10 bits should not exceed 1021. */
+#define SECTION_LENGTH 1020
+
 /* NOTE: 4 bytes must be left at the end for the crc32 */
 static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len)
 {
@@ -233,7 +237,7 @@ static void mpegts_write_pat(AVFormatContext *s)
 {
 MpegTSWrite *ts = s->priv_data;
 MpegTSService *service;
-uint8_t data[1012], *q;
+uint8_t data[SECTION_LENGTH], *q;
 int i;
 
 q = data;
@@ -249,7 +253,7 @@ static void mpegts_write_pat(AVFormatContext *s)
 static void mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
 {
 MpegTSWrite *ts = s->priv_data;
-uint8_t data[1012], *q, *desc_length_ptr, *program_info_length_ptr;
+uint8_t data[SECTION_LENGTH], *q, *desc_length_ptr, 
*program_info_length_ptr;
 int val, stream_type, i;
 
 q = data;
@@ -401,7 +405,7 @@ static void mpegts_write_sdt(AVFormatContext *s)
 {
 MpegTSWrite *ts = s->priv_data;
 MpegTSService *service;
-uint8_t data[1012], *q, *desc_list_len_ptr, *desc_len_ptr;
+uint8_t data[SECTION_LENGTH], *q, *desc_list_len_ptr, *desc_len_ptr;
 int i, running_status, free_ca_mode, val;
 
 q = data;

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

[FFmpeg-cvslog] Merge commit '694b7cd873f8b06af109036eff1ccd741afdd28e' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:09:10 2014 +0200| [a507fea70769533d2f666bcc63edc8d15b6784be] | committer: 
Michael Niedermayer

Merge commit '694b7cd873f8b06af109036eff1ccd741afdd28e' into release/1.1

* commit '694b7cd873f8b06af109036eff1ccd741afdd28e':
  mpegts: Define the section length with a constant

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Merge commit 'addbaf134836aea4e14f73add8c6d753a1373257' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:21:17 2014 +0200| [807b7388402eb53c2022428f17dfbeaf8312ba74] | committer: 
Michael Niedermayer

Merge commit 'addbaf134836aea4e14f73add8c6d753a1373257' into release/1.1

* commit 'addbaf134836aea4e14f73add8c6d753a1373257':
  mpegts: Do not try to write a PMT larger than SECTION_SIZE

Conflicts:
libavformat/mpegtsenc.c

See: 694c3a13c9489c6e05f88486b489dd0746d114fc
Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Update Changelog for v9.15

2014-08-30 Thread Reinhard Tartler 
ffmpeg | branch: release/1.1 | Reinhard Tartler  | Fri Aug 
 8 20:46:15 2014 -0400| [8da037af332790c704de6127406d5f6b3734acf0] | committer: 
Reinhard Tartler

Update Changelog for v9.15

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

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

diff --git a/Changelog b/Changelog
index 96171c9..27de0aa 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,9 @@
 Releases are sorted from youngest to oldest.
 
 version 9.15:
+- vp3: Copy all 3 frames for thread updates (CVE-2011-3934)
+- mpegts: Do not try to write a PMT larger than SECTION_SIZE (CVE-2014-2263)
+- mpegts: Define the section length with a constant
 - error_concealment: avoid using the picture if not fully setup (CVE-2013-0860)
 - svq1: do not modify the input packet
 - cdgraphics: do not return 0 from the decode function

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

[FFmpeg-cvslog] Prepare for 9.15 Release

2014-08-30 Thread Reinhard Tartler 
ffmpeg | branch: release/1.1 | Reinhard Tartler  | Fri Aug 
 8 21:57:46 2014 -0400| [e86074e6ef23f14273cbf4af84c8d2491f744a79] | committer: 
Reinhard Tartler

Prepare for 9.15 Release

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

 RELEASE |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE b/RELEASE
index 3f678b4..68d3e62 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-9.14
+9.15

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

[FFmpeg-cvslog] vp3: Copy all 3 frames for thread updates

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Mon Aug 
 4 01:12:47 2014 +0100| [437848e37ae7ef73cd8101031dc570d1f009ffd5] | committer: 
Vittorio Giovara

vp3: Copy all 3 frames for thread updates

Fixes a double release of the current frame on deinit.

Bug-Id: CVE-2011-3934
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Vittorio Giovara 

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

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

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 1d68c09..c334363 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1869,7 +1869,7 @@ static int vp3_update_thread_context(AVCodecContext *dst, 
const AVCodecContext *
 ||s->width != s1->width
 ||s->height!= s1->height) {
 if (s != s1)
-copy_fields(s, s1, golden_frame, current_frame);
+copy_fields(s, s1, golden_frame, keyframe);
 return -1;
 }
 

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

[FFmpeg-cvslog] Merge commit 'bd41211395fd1f968e9f3a4746daffebea60f41e' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:38:41 2014 +0200| [f953c3c2343dc78c45a001aa38ecb20cee447df7] | committer: 
Michael Niedermayer

Merge commit 'bd41211395fd1f968e9f3a4746daffebea60f41e' into release/1.1

* commit 'bd41211395fd1f968e9f3a4746daffebea60f41e':
  Re-release 9.15 as 9.16
  Prepare for 9.15 Release
  Update Changelog for v9.15

Conflicts:
Changelog
RELEASE

Not merged, as the versions are different in FFmpeg

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Re-release 9.15 as 9.16

2014-08-30 Thread Reinhard Tartler 
ffmpeg | branch: release/1.1 | Reinhard Tartler  | Sat Aug 
 9 08:55:45 2014 -0400| [bd41211395fd1f968e9f3a4746daffebea60f41e] | committer: 
Reinhard Tartler

Re-release 9.15 as 9.16

This is a clean fixup of the tagging mistake in the v9.15 release

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

 Changelog |2 +-
 RELEASE   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog b/Changelog
index 27de0aa..d3cf1ef 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,6 @@
 Releases are sorted from youngest to oldest.
 
-version 9.15:
+version 9.16:
 - vp3: Copy all 3 frames for thread updates (CVE-2011-3934)
 - mpegts: Do not try to write a PMT larger than SECTION_SIZE (CVE-2014-2263)
 - mpegts: Define the section length with a constant
diff --git a/RELEASE b/RELEASE
index 68d3e62..fd9cd75 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-9.15
+9.16

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

[FFmpeg-cvslog] Merge commit '437848e37ae7ef73cd8101031dc570d1f009ffd5' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:36:00 2014 +0200| [dcce698fd88768264614eb139fc62b2340bff787] | committer: 
Michael Niedermayer

Merge commit '437848e37ae7ef73cd8101031dc570d1f009ffd5' into release/1.1

* commit '437848e37ae7ef73cd8101031dc570d1f009ffd5':
  vp3: Copy all 3 frames for thread updates

See: 247d30a7dba6684ccce4508424f35fd58465e535
Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] mpegenc: limit the maximum muxrate

2014-08-30 Thread Anton Khirnov 
ffmpeg | branch: release/1.1 | Anton Khirnov  | Mon Aug 25 
21:21:57 2014 +| [bbd632082b18e6c5ce9c2d6be8bc260c05ae9417] | committer: 
Anton Khirnov

mpegenc: limit the maximum muxrate

It is written to the file as a 22-bit value.

CC: libav-sta...@libav.org
(cherry picked from commit 75bbaf2493a71ee66eaabe3c21fadd84d07888de)
Signed-off-by: Anton Khirnov 

Conflicts:
libavformat/mpegenc.c

(cherry picked from commit 3ac0638d573fc483ba6be3444858b26711c5d67d)
Signed-off-by: Anton Khirnov 

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

 libavformat/mpegenc.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 4f7bde8..218c2eb 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -1132,7 +1132,7 @@ static int mpeg_mux_end(AVFormatContext *ctx)
 #define OFFSET(x) offsetof(MpegMuxContext, x)
 #define E AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
-{ "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 
INT_MAX, E },
+{ "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, {.i64 = 0}, 0, (1 << 
22) - 1, E },
 { "preload", "Initial demux-decode delay in microseconds.", 
OFFSET(preload),  AV_OPT_TYPE_INT, {.i64 = 50}, 0, INT_MAX, E},
 { NULL },
 };

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

[FFmpeg-cvslog] ffv1dec: check that global parameters do not change in version 0/1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Fri Aug 
30 04:51:09 2013 +0200| [e4fb53c73abece15a7c5df0019df9a0371db2297] | committer: 
Anton Khirnov

ffv1dec: check that global parameters do not change in version 0/1

Such changes are neither allowed nor supported

Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-sta...@libav.org
Signed-off-by: Anton Khirnov 
(cherry picked from commit da7d839a0d3ec40423a665dc85e0cfaed3f92eb8)
Signed-off-by: Anton Khirnov 

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

 libavcodec/ffv1dec.c |   32 +---
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index e74598c..d070904 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -542,6 +542,7 @@ static int read_header(FFV1Context *f)
 memset(state, 128, sizeof(state));
 
 if (f->version < 2) {
+int chroma_planes, chroma_h_shift, chroma_v_shift, transparency, 
colorspace, bits_per_raw_sample;
 unsigned v = get_symbol(c, state, 0);
 if (v > 1) {
 av_log(f->avctx, AV_LOG_ERROR,
@@ -558,15 +559,32 @@ static int read_header(FFV1Context *f)
 get_symbol(c, state, 1) + c->one_state[i];
 }
 
-f->colorspace = get_symbol(c, state, 0); //YUV cs type
+colorspace  = get_symbol(c, state, 0); //YUV cs type
+bits_per_raw_sample = f->version > 0 ? get_symbol(c, state, 0) : 
f->avctx->bits_per_raw_sample;
+chroma_planes   = get_rac(c, state);
+chroma_h_shift  = get_symbol(c, state, 0);
+chroma_v_shift  = get_symbol(c, state, 0);
+transparency= get_rac(c, state);
+
+if (f->plane_count) {
+if (colorspace  != f->colorspace ||
+bits_per_raw_sample != f->avctx->bits_per_raw_sample ||
+chroma_planes   != f->chroma_planes  ||
+chroma_h_shift  != f->chroma_h_shift ||
+chroma_v_shift  != f->chroma_v_shift ||
+transparency!= f->transparency) {
+av_log(f->avctx, AV_LOG_ERROR, "Invalid change of global 
parameters\n");
+return AVERROR_INVALIDDATA;
+}
+}
 
-if (f->version > 0)
-f->avctx->bits_per_raw_sample = get_symbol(c, state, 0);
+f->colorspace = colorspace;
+f->avctx->bits_per_raw_sample = bits_per_raw_sample;
+f->chroma_planes  = chroma_planes;
+f->chroma_h_shift = chroma_h_shift;
+f->chroma_v_shift = chroma_v_shift;
+f->transparency   = transparency;
 
-f->chroma_planes  = get_rac(c, state);
-f->chroma_h_shift = get_symbol(c, state, 0);
-f->chroma_v_shift = get_symbol(c, state, 0);
-f->transparency   = get_rac(c, state);
 f->plane_count= 2 + f->transparency;
 }
 

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

[FFmpeg-cvslog] Merge commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:50:50 2014 +0200| [0a6d39791165e46c53c34793261378ef38442272] | committer: 
Michael Niedermayer

Merge commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417' into release/1.1

* commit 'bbd632082b18e6c5ce9c2d6be8bc260c05ae9417':
  mpegenc: limit the maximum muxrate

Conflicts:
libavformat/mpegenc.c

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Merge commit 'e4fb53c73abece15a7c5df0019df9a0371db2297' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:47:07 2014 +0200| [081f4f5f56e0f6220039e39b9be2c2a2021dd40c] | committer: 
Michael Niedermayer

Merge commit 'e4fb53c73abece15a7c5df0019df9a0371db2297' into release/1.1

* commit 'e4fb53c73abece15a7c5df0019df9a0371db2297':
  ffv1dec: check that global parameters do not change in version 0/1

Conflicts:
libavcodec/ffv1dec.c

See: f78a3868fd3d8f66da68338c0783aa15f98833bf
Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:58:25 2014 +0200| [fed28fe054de573643ae3fee50ad7ae09d78e738] | committer: 
Michael Niedermayer

Merge commit '8d7839fc7c52574dfc22db0181b1cef9cb929910' into release/1.1

* commit '8d7839fc7c52574dfc22db0181b1cef9cb929910':
  avconv: fix the muxrate values for -target

Conflicts:
ffmpeg_opt.c

No change, as ffmpegs muxrate is in bits/sec

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] avconv: fix parsing the AVOptions for -target

2014-08-30 Thread Anton Khirnov 
ffmpeg | branch: release/1.1 | Anton Khirnov  | Tue Aug 26 
06:26:35 2014 +| [e1f0c41e1aa37a9c166c43abf1b526c796ed7649] | committer: 
Anton Khirnov

avconv: fix parsing the AVOptions for -target

CC: libav-sta...@libav.org
(cherry picked from commit f5245a9c6206878b892adf3ccbccc9311c202af5)
Signed-off-by: Anton Khirnov 
(cherry picked from commit f7395926f204051af9ad459a6d876b96ee6179ee)
Signed-off-by: Anton Khirnov 

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

 avconv_opt.c |4 
 1 file changed, 4 insertions(+)

diff --git a/avconv_opt.c b/avconv_opt.c
index 8f7fb3a..3c82657 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1633,6 +1633,10 @@ static int opt_target(void *optctx, const char *opt, 
const char *arg)
 av_log(NULL, AV_LOG_ERROR, "Unknown target: %s\n", arg);
 return AVERROR(EINVAL);
 }
+
+av_dict_copy(&o->g->codec_opts,  codec_opts, 0);
+av_dict_copy(&o->g->format_opts, format_opts, 0);
+
 return 0;
 }
 

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

[FFmpeg-cvslog] Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 20:58:46 2014 +0200| [946a106995bca70a360f5bd03fa503e8beb09cc5] | committer: 
Michael Niedermayer

Merge commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649' into release/1.1

* commit 'e1f0c41e1aa37a9c166c43abf1b526c796ed7649':
  avconv: fix parsing the AVOptions for -target

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] avconv: fix the muxrate values for -target

2014-08-30 Thread Anton Khirnov 
ffmpeg | branch: release/1.1 | Anton Khirnov  | Mon Aug 25 
21:24:35 2014 +| [8d7839fc7c52574dfc22db0181b1cef9cb929910] | committer: 
Anton Khirnov

avconv: fix the muxrate values for -target

The mpegenc private option values are in 50-byte units.

CC: libav-sta...@libav.org
(cherry picked from commit 1688eef25385089026aba55da1885f70a57815ab)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 7bc37641e3e6c24d472ae06fcbecaba4c863829b)
Signed-off-by: Anton Khirnov 

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

 avconv_opt.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/avconv_opt.c b/avconv_opt.c
index 17ec0d9..8f7fb3a 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -1566,7 +1566,7 @@ static int opt_target(void *optctx, const char *opt, 
const char *arg)
 parse_option(o, "ac", "2", options);
 
 opt_default(NULL, "packetsize", "2324");
-opt_default(NULL, "muxrate", "1411200"); // 2352 * 75 * 8;
+opt_default(NULL, "muxrate", "3528"); // 2352 * 75 / 50;
 
 /* We have to offset the PTS, so that it is consistent with the SCR.
SCR starts at 36000, but the first two packs contain only padding
@@ -1612,7 +1612,7 @@ static int opt_target(void *optctx, const char *opt, 
const char *arg)
 opt_default(NULL, "bufsize", "1835008"); // 224*1024*8;
 
 opt_default(NULL, "packetsize", "2048");  // from www.mpucoder.com: 
DVD sectors contain 2048 bytes of data, this is also the size of one pack.
-opt_default(NULL, "muxrate", "1008"); // from mplex project: 
data_rate = 126. mux_rate = data_rate * 8
+opt_default(NULL, "muxrate", "25200"); // from mplex project: 
data_rate = 126. mux_rate = data_rate / 50
 
 opt_default(NULL, "b:a", "448000");
 parse_option(o, "ar", "48000", options);

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

[FFmpeg-cvslog] Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 21:07:32 2014 +0200| [d03fd2c8052ee80e7221ab02ab0fcb5220e92698] | committer: 
Michael Niedermayer

Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1

* commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86':
  pulse: Add a wallclock option to be compatible with other other captures

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] pulse: Add a wallclock option to be compatible with other other captures

2014-08-30 Thread Luca Barbato 
ffmpeg | branch: release/1.1 | Luca Barbato  | Sat Aug 23 
19:03:21 2014 +0200| [124ec8b1303d4f29b833099ce9008e31ac6d7c86] | committer: 
Luca Barbato

pulse: Add a wallclock option to be compatible with other other captures

alsa and x11grab use av_gettime() to report timestamps.

Have it on by default.

Bug-Id: 647
(cherry picked from commit 424b929b5cb9ca4094099f25179829260d4b0fa3)
(cherry picked from commit 404731bd20e1df5880e6fe381e975ba48afc75b2)
Signed-off-by: Luca Barbato 

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

 libavdevice/pulse.c |5 +
 1 file changed, 5 insertions(+)

diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c
index a8e710d..2136ee3 100644
--- a/libavdevice/pulse.c
+++ b/libavdevice/pulse.c
@@ -31,6 +31,7 @@
 
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
+#include "libavutil/time.h"
 #include "libavutil/opt.h"
 
 #define DEFAULT_CODEC_ID AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE)
@@ -47,6 +48,7 @@ typedef struct PulseData {
 pa_simple *s;
 int64_t pts;
 int64_t frame_duration;
+int wallclock;
 } PulseData;
 
 static pa_sample_format_t codec_id_to_pulse_format(int codec_id) {
@@ -141,6 +143,8 @@ static int pulse_read_packet(AVFormatContext *s, AVPacket 
*pkt)
 
 if (pd->pts == AV_NOPTS_VALUE) {
 pd->pts = -latency;
+if (pd->wallclock)
+pd->pts += av_gettime();
 }
 
 pkt->pts = pd->pts;
@@ -168,6 +172,7 @@ static const AVOption options[] = {
 { "channels",  "number of audio channels",   
OFFSET(channels),  AV_OPT_TYPE_INT,{.i64 = 2},1, INT_MAX, D },
 { "frame_size","number of bytes per frame",  
OFFSET(frame_size),AV_OPT_TYPE_INT,{.i64 = 1024}, 1, INT_MAX, D },
 { "fragment_size", "buffering size, affects latency and cpu usage",  
OFFSET(fragment_size), AV_OPT_TYPE_INT,{.i64 = -1},  -1, INT_MAX, D },
+{ "wallclock", "set the initial pts using the current time", 
OFFSET(wallclock), AV_OPT_TYPE_INT,{.i64 = 1},   -1, 1, D },
 { NULL },
 };
 

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

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. f3e7874 web/rss: Include content of the news article

2014-08-30 Thread gitolite 
The branch, master has been updated
   via  f3e787400b0351d08183df183b6497db53ff6a8d (commit)
  from  b3d5da4914ddf248e7097d8d0a399f156f667b3a (commit)


- Log -
commit f3e787400b0351d08183df183b6497db53ff6a8d
Author: Alexander Strasser 
AuthorDate: Thu May 1 22:34:46 2014 +0200
Commit: Alexander Strasser 
CommitDate: Sat Aug 30 21:35:28 2014 +0200

web/rss: Include content of the news article

Fixes Trac ticket #844

Inspired-by-patch-from: Gerion Entrup
Signed-off-by: Alexander Strasser 

diff --git a/Makefile b/Makefile
index bbd9d51..5c376eb 100644
--- a/Makefile
+++ b/Makefile
@@ -38,19 +38,24 @@ htdocs/%.html: src/% src/%_title src/%_js $(DEPS)
 
 $(RSS_TARGET): htdocs/index.html
echo '' > $@
-   echo 'http://www.w3.org/2005/Atom";>' >> 
$@
+   echo 'http://www.w3.org/2005/Atom"; 
xmlns:content="http://purl.org/rss/1.0/modules/content/";>' >> $@
echo '' >> $@
echo 'FFmpeg RSS' >> $@
echo 'http://ffmpeg.org' >> $@
echo 'FFmpeg RSS' >> $@
echo 'http://ffmpeg.org/main.rss"; rel="self" 
type="application/rss+xml" />' >> $@
-   grep '.*20..,.*' $< | sed 'sX * *\(.*20..\), *\(.*\)X\
+   awk '/ *<\/a> *.*20.., *.*<\/h3>/ { p = 1 } 
/Older entries are in the .*news archive/ { p = 0 } p' $< \
+| sed 'sX * *\(.*20..\), *\(.*\)X\
+]]>\
+\
 \
 \2, \3\
 http://ffmpeg.org/index.html#\1\
 http://ffmpeg.org/index.html#\1\
-\
-X' >> $@
+' >> $@
+   echo '' >> $@
echo '' >> $@
echo '' >> $@
 

---

Summary of changes:
 Makefile |   13 +
 1 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 

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

[FFmpeg-cvslog] avcodec: fix aac/ac3 parser bitstream buffer size

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Fri Aug 
22 01:15:57 2014 +0200| [c58d7f9eb56abc4c90d98011c23a4a031077af4e] | committer: 
Michael Niedermayer

avcodec: fix aac/ac3 parser bitstream buffer size

Buffers containing copies of the AAC and AC3 header bits were not padded
before parsing, violating init_get_bits() buffer padding requirement,
leading to potential buffer read overflows.
This change adds FF_INPUT_BUFFER_PADDING_SIZE bytes to the bit buffer
for parsing the header in each of aac_parser.c and ac3_parser.c.

Based on patch by: Matt Wolenetz 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit fccd85b9f30525f88692f53134eba41f1f2d90db)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/aac_parser.c |2 +-
 libavcodec/ac3_parser.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index ab6ca4e..cb93ba9 100644
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -34,7 +34,7 @@ static int aac_sync(uint64_t state, AACAC3ParseContext 
*hdr_info,
 int size;
 union {
 uint64_t u64;
-uint8_t  u8[8];
+uint8_t  u8[8 + FF_INPUT_BUFFER_PADDING_SIZE];
 } tmp;
 
 tmp.u64 = av_be2ne64(state);
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 8dc4c0d..acfbc2e 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -147,7 +147,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext 
*hdr_info,
 int err;
 union {
 uint64_t u64;
-uint8_t  u8[8];
+uint8_t  u8[8 + FF_INPUT_BUFFER_PADDING_SIZE];
 } tmp = { av_be2ne64(state) };
 AC3HeaderInfo hdr;
 GetBitContext gbc;

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

[FFmpeg-cvslog] proresenc_kostya: report buffer overflow

2014-08-30 Thread Christophe Gisquet 
ffmpeg | branch: release/1.1 | Christophe Gisquet 
 | Mon Aug 11 22:06:08 2014 +| 
[11a61dd0e2b51bdb610a80e322667c3284f6d761] | committer: Michael Niedermayer

proresenc_kostya: report buffer overflow

If the allocated size, despite best efforts, is too small, exit
with the appropriate error.

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/proresenc_kostya.c |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c
index 0462c74..9f2aa58 100644
--- a/libavcodec/proresenc_kostya.c
+++ b/libavcodec/proresenc_kostya.c
@@ -455,6 +455,11 @@ static int encode_slice(AVCodecContext *avctx, const 
AVFrame *pic,
   num_cblocks, plane_factor,
   qmat);
 total_size += sizes[i];
+if (put_bits_left(pb) < 0) {
+av_log(avctx, AV_LOG_ERROR, "Serious underevaluation of"
+   "required buffer size");
+return AVERROR_BUFFER_TOO_SMALL;
+}
 }
 return total_size;
 }
@@ -753,9 +758,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket 
*pkt,
 avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 avctx->coded_frame->key_frame = 1;
 
-pkt_size = ctx->frame_size_upper_bound + FF_MIN_BUFFER_SIZE;
+pkt_size = ctx->frame_size_upper_bound;
 
-if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size)) < 0)
+if ((ret = ff_alloc_packet2(avctx, pkt, pkt_size + FF_MIN_BUFFER_SIZE)) < 
0)
 return ret;
 
 orig_buf = pkt->data;
@@ -832,7 +837,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket 
*pkt,
 slice_hdr = buf;
 buf += slice_hdr_size - 1;
 init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8);
-encode_slice(avctx, pic, &pb, sizes, x, y, q, mbs_per_slice);
+ret = encode_slice(avctx, pic, &pb, sizes, x, y, q, 
mbs_per_slice);
+if (ret < 0)
+return ret;
 
 bytestream_put_byte(&slice_hdr, q);
 slice_size = slice_hdr_size + sizes[ctx->num_planes - 1];

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

[FFmpeg-cvslog] avcodec/iff: check pixfmt for rgb8 / rgbn

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sun Aug 
10 21:59:33 2014 +0200| [5865d599c38850b2a1fd33fe197eb8fcc6c970a4] | committer: 
Michael Niedermayer

avcodec/iff: check pixfmt for rgb8 / rgbn

Fixes out of array access

Found-by: Piotr Bandurski 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 3539d6c63a16e1b2874bb037a86f317449c58770)

Conflicts:

libavcodec/iff.c
(cherry picked from commit 656f930160db48e0b7b25069c62abc340e7f0628)

Conflicts:

libavcodec/iff.c
(cherry picked from commit abc1fa7c5a1dca1345b9471b81cfcda00c56220d)

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index bebf6a5..37b7f25 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -832,9 +832,9 @@ static int decode_frame(AVCodecContext *avctx,
 break;
 case 4:
 bytestream2_init(&gb, buf, buf_size);
-if (avctx->codec_tag == MKTAG('R','G','B','8'))
+if (avctx->codec_tag == MKTAG('R','G','B','8') && avctx->pix_fmt == 
AV_PIX_FMT_RGB32)
 decode_rgb8(&gb, s->frame.data[0], avctx->width, avctx->height, 
s->frame.linesize[0]);
-else if (avctx->codec_tag == MKTAG('R','G','B','N'))
+else if (avctx->codec_tag == MKTAG('R','G','B','N') && avctx->pix_fmt 
== AV_PIX_FMT_RGB444)
 decode_rgbn(&gb, s->frame.data[0], avctx->width, avctx->height, 
s->frame.linesize[0]);
 else
 return unsupported(avctx);

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

[FFmpeg-cvslog] avcodec/utils: add GBRP16 to avcodec_align_dimensions2()

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sun Aug 
24 23:33:40 2014 +0200| [0bf0de718524cb6025a6568c46f3296acdd4fd5a] | committer: 
Michael Niedermayer

avcodec/utils: add GBRP16 to avcodec_align_dimensions2()

Fixes Ticket3869

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c25d641..4bf0392 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -234,6 +234,8 @@ void avcodec_align_dimensions2(AVCodecContext *s, int 
*width, int *height,
 case AV_PIX_FMT_GBRP12BE:
 case AV_PIX_FMT_GBRP14LE:
 case AV_PIX_FMT_GBRP14BE:
+case AV_PIX_FMT_GBRP16LE:
+case AV_PIX_FMT_GBRP16BE:
 w_align = 16; //FIXME assume 16 pixel per macroblock
 h_align = 16 * 2; // interlaced needs 2 macroblocks height
 break;

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

[FFmpeg-cvslog] avcodec/snow: check coeffs for validity

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 02:12:10 2014 +0200| [96d1a8f0145bd8d8e3b73d064afcb969376c3b5f] | committer: 
Michael Niedermayer

avcodec/snow: check coeffs for validity

Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/snow.h |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index a87d739..813fcba 100644
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -650,7 +650,10 @@ static inline void unpack_coeffs(SnowContext *s, SubBand 
*b, SubBand * parent, i
 if(v){
 v= 2*(get_symbol2(&s->c, b->state[context + 2], context-4) 
+ 1);
 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3 + 
ff_quant3bA[l&0xFF] + 3*ff_quant3bA[t&0xFF]]);
-
+if ((uint16_t)v != v) {
+av_log(s->avctx, AV_LOG_ERROR, "Coefficient 
damaged\n");
+v = 1;
+}
 xc->x=x;
 (xc++)->coeff= v;
 }
@@ -660,6 +663,10 @@ static inline void unpack_coeffs(SnowContext *s, SubBand 
*b, SubBand * parent, i
 else   run= INT_MAX;
 v= 2*(get_symbol2(&s->c, b->state[0 + 2], 0-4) + 1);
 v+=get_rac(&s->c, &b->state[0][16 + 1 + 3]);
+if ((uint16_t)v != v) {
+av_log(s->avctx, AV_LOG_ERROR, "Coefficient 
damaged\n");
+v = 1;
+}
 
 xc->x=x;
 (xc++)->coeff= v;

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

[FFmpeg-cvslog] Update for 1.1.14

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Sat Aug 
30 21:44:13 2014 +0200| [195fcbff2b64f3b8b9e9b8ae7dfe8c192ef1918e] | committer: 
Michael Niedermayer

Update for 1.1.14

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/RELEASE b/RELEASE
index 9ea63db..e9bc149 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1 +1 @@
-1.1.13
+1.1.14
diff --git a/VERSION b/VERSION
index 9ea63db..e9bc149 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.13
+1.1.14
diff --git a/doc/Doxyfile b/doc/Doxyfile
index ec41e77..972bcaf 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 = 1.1.13
+PROJECT_NUMBER = 1.1.14
 
 # With the PROJECT_LOGO tag one can specify an 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] version.sh: Print versions based on the last git tag for release branches

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Mon Jul 
28 02:40:35 2014 +0200| [3ed4dc92284cfa1ce06e5af4458fdd374b3ca43d] | committer: 
Michael Niedermayer

version.sh: Print versions based on the last git tag for release branches

release branches are detected by checking if "git" is not in RELEASE
This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb"
for git master theres no change

This should improve the readability of lists of versions which come from
more than 1 release branch or master + release. fate.ffmpeg.org is
one possible example

Reviewed-by: Timothy Gu 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit ee606fd0317df202b59946cf9b738c0a01056316)

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

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

Signed-off-by: Michael Niedermayer 

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

 version.sh |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/version.sh b/version.sh
index 8d084c2..2309176 100755
--- a/version.sh
+++ b/version.sh
@@ -2,7 +2,11 @@
 
 # check for git short hash
 if ! test "$revision"; then
-revision=$(cd "$1" && git describe --tags --match N 2> /dev/null)
+if (cd "$1" && grep git RELEASE 2> /dev/null >/dev/null) ; then
+revision=$(cd "$1" && git describe --tags --match N 2> /dev/null)
+else
+revision=$(cd "$1" && git describe --tags --always 2> /dev/null)
+fi
 fi
 
 # Shallow Git clones (--depth) do not have the N tag:

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

[FFmpeg-cvslog] remove VERSION file

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: release/1.1 | Michael Niedermayer  | Mon Jul 
28 02:22:11 2014 +0200| [4ede955d864d6d8163abdf490f8af6cc49154e38] | committer: 
Michael Niedermayer

remove VERSION file

it overrides what version.sh prints and thus makes its output
from release branches rather useless

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

Conflicts:

VERSION
(cherry picked from commit f543d32455a30c7e11206241184dfb16b8a8081c)

Conflicts:

VERSION
(cherry picked from commit 59b2a9ef957ec796ccf457aad263a52bc457b610)

Conflicts:

VERSION

Signed-off-by: Michael Niedermayer 

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

 VERSION |1 -
 1 file changed, 1 deletion(-)

diff --git a/VERSION b/VERSION
deleted file mode 100644
index e9bc149..000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.1.14

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

[FFmpeg-cvslog] avcodec/lcldec: fix decoding of YUV444 sample

2014-08-30 Thread Piotr Bandurski 
ffmpeg | branch: release/1.1 | Piotr Bandurski  | Sun Aug 17 
18:17:13 2014 +0200| [f3c8a8b087d08019604fd641970b49144cc3dfa2] | committer: 
Michael Niedermayer

avcodec/lcldec: fix decoding of YUV444 sample

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 5708a12..6893018 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -199,7 +199,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, 
int *got_frame, AVPac
 case AV_CODEC_ID_MSZH:
 switch (c->compression) {
 case COMP_MSZH:
-if (c->imgtype == IMGTYPE_RGB24 && len == width * height * 3) {
+if (c->imgtype == IMGTYPE_RGB24 && len == width * height * 3 ||
+c->imgtype == IMGTYPE_YUV111 && len == width * height * 3) {
 ;
 } else if (c->flags & FLAG_MULTITHREAD) {
 mthread_inlen = AV_RL32(encoded);

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

[FFmpeg-cvslog] alacenc: increase predictor buffer

2014-08-30 Thread Christophe Gisquet 
ffmpeg | branch: release/1.1 | Christophe Gisquet 
 | Sun Aug 17 17:09:13 2014 +| 
[7f7cf051edd3562af199be97864e03bc3e3ceda0] | committer: Michael Niedermayer

alacenc: increase predictor buffer

This change is almost cosmetical only, and reduces the changes needed to
fix the 24bps case.

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/alacenc.c |   19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
index 5354d0b..e92831f 100644
--- a/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@ -67,7 +67,7 @@ typedef struct AlacEncodeContext {
 int write_sample_size;
 int extra_bits;
 int32_t sample_buf[2][DEFAULT_FRAME_SIZE];
-int32_t predictor_buf[DEFAULT_FRAME_SIZE];
+int32_t predictor_buf[2][DEFAULT_FRAME_SIZE];
 int interlacing_shift;
 int interlacing_leftweight;
 PutBitContext pbctx;
@@ -254,13 +254,14 @@ static void alac_linear_predictor(AlacEncodeContext *s, 
int ch)
 {
 int i;
 AlacLPCContext lpc = s->lpc[ch];
+int32_t *residual = s->predictor_buf[ch];
 
 if (lpc.lpc_order == 31) {
-s->predictor_buf[0] = s->sample_buf[ch][0];
+residual[0] = s->sample_buf[ch][0];
 
 for (i = 1; i < s->frame_size; i++) {
-s->predictor_buf[i] = s->sample_buf[ch][i] -
-  s->sample_buf[ch][i - 1];
+residual[i] = s->sample_buf[ch][i] -
+  s->sample_buf[ch][i - 1];
 }
 
 return;
@@ -270,7 +271,6 @@ static void alac_linear_predictor(AlacEncodeContext *s, int 
ch)
 
 if (lpc.lpc_order > 0) {
 int32_t *samples  = s->sample_buf[ch];
-int32_t *residual = s->predictor_buf;
 
 // generate warm-up samples
 residual[0] = samples[0];
@@ -314,11 +314,11 @@ static void alac_linear_predictor(AlacEncodeContext *s, 
int ch)
 }
 }
 
-static void alac_entropy_coder(AlacEncodeContext *s)
+static void alac_entropy_coder(AlacEncodeContext *s, int ch)
 {
 unsigned int history = s->rc.initial_history;
 int sign_modifier = 0, i, k;
-int32_t *samples = s->predictor_buf;
+int32_t *samples = s->predictor_buf[ch];
 
 for (i = 0; i < s->frame_size;) {
 int x;
@@ -433,10 +433,11 @@ static void write_element(AlacEncodeContext *s,
 // TODO: determine when this will actually help. for now it's not 
used.
 if (prediction_type == 15) {
 // 2nd pass 1st order filter
+int32_t *residual = s->predictor_buf[channels];
 for (j = s->frame_size - 1; j > 0; j--)
-s->predictor_buf[j] -= s->predictor_buf[j - 1];
+residual[j] -= residual[j - 1];
 }
-alac_entropy_coder(s);
+alac_entropy_coder(s, i);
 }
 }
 }

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

[FFmpeg-cvslog] avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p

2014-08-30 Thread Jon Morley 
ffmpeg | branch: release/1.1 | Jon Morley  | Tue Aug 19 
11:17:49 2014 -0700| [552fe9b07f6b0cd6879869e1b4a17e9293fbd5a5] | committer: 
Michael Niedermayer

avcodec/adpcm: Fix incorrect AVSampleFormat for sample_fmts_s16p

The AVSampleFormat list of sample_fmts_s16p is missing the trailing "P" for 
planar formats. AV_SAMPLE_FMT_S16 vs AV_SAMPLE_FMT_S16P

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index cd68257..40ead43 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -1387,7 +1387,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void 
*data,
 
 static const enum AVSampleFormat sample_fmts_s16[]  = { AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_NONE };
-static const enum AVSampleFormat sample_fmts_s16p[] = { AV_SAMPLE_FMT_S16,
+static const enum AVSampleFormat sample_fmts_s16p[] = { AV_SAMPLE_FMT_S16P,
 AV_SAMPLE_FMT_NONE };
 static const enum AVSampleFormat sample_fmts_both[] = { AV_SAMPLE_FMT_S16,
 AV_SAMPLE_FMT_S16P,

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

[FFmpeg-cvslog] wavpack: report if there is no bits left

2014-08-30 Thread Christophe Gisquet 
ffmpeg | branch: release/1.1 | Christophe Gisquet 
 | Tue Aug 19 12:26:47 2014 +| 
[3231e7ab64efaf073037f2bab08f0e8b1f0116d0] | committer: Michael Niedermayer

wavpack: report if there is no bits left

Reviewed-by: Paul B Mahol 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 11a39bdf534a4ead634b4a593c66ebf756910b9b)

Signed-off-by: Michael Niedermayer 

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

 libavcodec/wavpack.c |4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 36f3ad7..2493089 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -398,6 +398,10 @@ static int wv_get_value(WavpackFrameContext *ctx, 
GetBitContext *gb,
 return sign ? ~ret : ret;
 
 error:
+ret = get_bits_left(gb);
+if (ret <= 0) {
+av_log(ctx->avctx, AV_LOG_ERROR, "Too few bits (%d) left\n", ret);
+}
 *last = 1;
 return 0;
 }

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

[FFmpeg-cvslog] alacenc: fix extra bits extraction

2014-08-30 Thread Christophe Gisquet 
ffmpeg | branch: release/1.1 | Christophe Gisquet 
 | Sun Aug 17 18:56:45 2014 +0200| 
[60f94f708414b187724d42e904b1b3aabe24ad85] | committer: Michael Niedermayer

alacenc: fix extra bits extraction

The raw coded bits are extracted prior to decorrelation, as is correctly
performed by the decoder, and not after.

Fixes ticket #2768.

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

Signed-off-by: Michael Niedermayer 

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

 libavcodec/alacenc.c |   16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
index e92831f..56cbfdc 100644
--- a/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@ -395,6 +395,19 @@ static void write_element(AlacEncodeContext *s,
 init_sample_buffers(s, channels, samples);
 write_element_header(s, element, instance);
 
+// extract extra bits if needed
+if (s->extra_bits) {
+uint32_t mask = (1 << s->extra_bits) - 1;
+for (j = 0; j < channels; j++) {
+int32_t *extra = s->predictor_buf[j];
+int32_t *smp   = s->sample_buf[j];
+for (i = 0; i < s->frame_size; i++) {
+extra[i] = smp[i] & mask;
+smp[i] >>= s->extra_bits;
+}
+}
+}
+
 if (channels == 2)
 alac_stereo_decorrelation(s);
 else
@@ -420,8 +433,7 @@ static void write_element(AlacEncodeContext *s,
 uint32_t mask = (1 << s->extra_bits) - 1;
 for (i = 0; i < s->frame_size; i++) {
 for (j = 0; j < channels; j++) {
-put_bits(pb, s->extra_bits, s->sample_buf[j][i] & mask);
-s->sample_buf[j][i] >>= s->extra_bits;
+put_bits(pb, s->extra_bits, s->predictor_buf[j][i] & mask);
 }
 }
 }

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

[FFmpeg-cvslog] Tag n1.1.14 : FFmpeg 1.1.14 release

2014-08-30 Thread git 
[ffmpeg] [branch: refs/tags/n1.1.14]
Tag:e2387d6e421218f04160591c5f38e277faa80cab
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=e2387d6e421218f04160591c5f38e277faa80cab

Tagger: Michael Niedermayer 
Date:   Sat Aug 30 23:22:31 2014 +0200

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

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 4a348c0 web/olddownload: add 1.1.14

2014-08-30 Thread gitolite 
The branch, master has been updated
   via  4a348c097f6d9a110a2f4c4541e9afbd7464a9c2 (commit)
  from  f3e787400b0351d08183df183b6497db53ff6a8d (commit)


- Log -
commit 4a348c097f6d9a110a2f4c4541e9afbd7464a9c2
Author: Michael Niedermayer 
AuthorDate: Sat Aug 30 23:26:47 2014 +0200
Commit: Michael Niedermayer 
CommitDate: Sat Aug 30 23:27:41 2014 +0200

web/olddownload: add 1.1.14

diff --git a/src/olddownload b/src/olddownload
index 3707b3d..adf7460 100644
--- a/src/olddownload
+++ b/src/olddownload
@@ -79,13 +79,13 @@ libpostproc52.  3.100
  
 
 
-  FFmpeg 1.1.13 "Fire Flower"
+  FFmpeg 1.1.14 "Fire Flower"
 
 
-  1.1.13 was released on 2014-08-08. It is the latest stable FFmpeg release
+  1.1.14 was released on 2014-08-30. It is the latest stable FFmpeg release
   from the 1.1 release branch, which was cut from master on 2013-01-06.
   Amongst lots of other changes, it includes all changes from
-  ffmpeg-mt, libav master of 2013-01-06, libav 9.14 as of 2014-08-08.
+  ffmpeg-mt, libav master of 2013-01-06, libav 9.16 as of 2014-08-30.
 
 It includes the following library versions:
 
@@ -102,15 +102,15 @@ libpostproc52.  2.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=n1.1.13";>Changelog
+http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n1.1.14";>Changelog

  
 

---

Summary of changes:
 src/olddownload |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 

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

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 237d416 web/security: add 1.1.14

2014-08-30 Thread gitolite 
The branch, master has been updated
   via  237d4160182e6795d93591f107a21fb781b5f718 (commit)
  from  4a348c097f6d9a110a2f4c4541e9afbd7464a9c2 (commit)


- Log -
commit 237d4160182e6795d93591f107a21fb781b5f718
Author: Michael Niedermayer 
AuthorDate: Sat Aug 30 23:30:39 2014 +0200
Commit: Michael Niedermayer 
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
 
 
 FFmpeg 1.1
+1.1.14
+
+Fixes following vulnerabilities:
+
+
+CVE-2014-5272, 5865d599c38850b2a1fd33fe197eb8fcc6c970a4 / 
3539d6c63a16e1b2874bb037a86f317449c58770
+CVE-2014-5271, 11a61dd0e2b51bdb610a80e322667c3284f6d761 / 
52b81ff4635c077b2bc8b8d3637d933b6629d803
+
+
 1.1.12
 
 Fixes following vulnerabilities:

---

Summary of changes:
 src/security |9 +
 1 files changed, 9 insertions(+), 0 deletions(-)


hooks/post-receive
-- 

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

[FFmpeg-cvslog] avcodec/h264: Do not get stuck on IDR inter frames

2014-08-30 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | 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 

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

 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");

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