date:20150730

[FFmpeg-cvslog] Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 12:14:13 2015 +0200| [dd0dbaccb74e545c1923cbb5284245e3d93c4fca] | 
committer: Michael Niedermayer

Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b'

* commit '9487ffd4c02b9e261562d43735490068c0df0d4b':
  rtmpproto: free hmac context properly

See: 6ce3d9fc4a70958680b93c6995cc87f34630a7e3
Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] rtmpproto: free hmac context properly

2015-07-30 Thread James Almer

ffmpeg | branch: master | James Almer  | Thu Jul 30 00:00:01 
2015 -0300| [9487ffd4c02b9e261562d43735490068c0df0d4b] | committer: Martin 
Storsjö

rtmpproto: free hmac context properly

Signed-off-by: James Almer 
Signed-off-by: Martin Storsjö 

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

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

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 1db7495..ec4b0e7 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -971,7 +971,7 @@ int ff_rtmp_calc_digest(const uint8_t *src, int len, int 
gap,
 }
 av_hmac_final(hmac, dst, 32);
 
-av_free(hmac);
+av_hmac_free(hmac);
 
 return 0;
 }

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

[FFmpeg-cvslog] Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 12:23:48 2015 +0200| [1919827f2c2bdf55264e3ed52cacf12b1289789f] | 
committer: Michael Niedermayer

Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448'

* commit 'bf0cef5c3a114df452e5476167634dd8f51eb448':
  checkasm: Include io.h for isatty, if available

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] checkasm: Include io.h for isatty, if available

2015-07-30 Thread Martin Storsjö

ffmpeg | branch: master | Martin Storsjö  | Wed Jul 29 
23:08:09 2015 +0300| [bf0cef5c3a114df452e5476167634dd8f51eb448] | committer: 
Martin Storsjö

checkasm: Include io.h for isatty, if available

configure does check for isatty, and checkasm properly checks
HAVE_ISATTY, but on some platforms (e.g. WinRT), io.h needs to be
included for isatty to be available.

Signed-off-by: Martin Storsjö 

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

 tests/checkasm/checkasm.c |4 
 1 file changed, 4 insertions(+)

diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c
index f1e9cd9..82c635e 100644
--- a/tests/checkasm/checkasm.c
+++ b/tests/checkasm/checkasm.c
@@ -29,6 +29,10 @@
 #include "libavutil/cpu.h"
 #include "libavutil/random_seed.h"
 
+#if HAVE_IO_H
+#include 
+#endif
+
 #if ARCH_X86
 #include "libavutil/x86/cpu.h"
 #endif

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

[FFmpeg-cvslog] ffmpeg: modify tty state when stderr is redirected

2015-07-30 Thread Ganesh Ajjanagadde

ffmpeg | branch: master | Ganesh Ajjanagadde  | Mon Jul 
27 09:56:25 2015 -0400| [92e62f49cf7440a9e8998d284528e223c0948c97] | committer: 
Michael Niedermayer

ffmpeg: modify tty state when stderr is redirected

This fixes Ticket2964

Signed-off-by: Ganesh Ajjanagadde 
Signed-off-by: Michael Niedermayer 

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

 ffmpeg.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 5575e2f..eb3f613 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -372,7 +372,7 @@ void term_init(void)
 struct termios tty;
 int istty = 1;
 #if HAVE_ISATTY
-istty = isatty(0) && isatty(2);
+istty = isatty(0);
 #endif
 if (istty && tcgetattr (0, &tty) == 0) {
 oldtty = tty;

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

[FFmpeg-cvslog] avcodec/v308enc: Remove coded_frame usage

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 15:54:45 2015 +0200| [a0123b602364a3e036683947b2642cbcd68e6f48] | 
committer: Michael Niedermayer

avcodec/v308enc: Remove coded_frame usage

coded_frame is deprecated

Signed-off-by: Michael Niedermayer 

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

 libavcodec/v308enc.c |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/v308enc.c b/libavcodec/v308enc.c
index 4331ec1..b60a72c 100644
--- a/libavcodec/v308enc.c
+++ b/libavcodec/v308enc.c
@@ -45,9 +45,6 @@ static int v308_encode_frame(AVCodecContext *avctx, AVPacket 
*pkt,
 return ret;
 dst = pkt->data;
 
-avctx->coded_frame->key_frame = 1;
-avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
-
 y = pic->data[0];
 u = pic->data[1];
 v = pic->data[2];
@@ -82,4 +79,5 @@ AVCodec ff_v308_encoder = {
 .encode2  = v308_encode_frame,
 .close= v308_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P, 
AV_PIX_FMT_NONE },
+.capabilities = AV_CODEC_CAP_INTRA_ONLY,
 };

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

[FFmpeg-cvslog] avcodec/v408enc: remove coded_frame usage

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 15:53:54 2015 +0200| [2d80de0be2b85111b3f007e4d57c101a46eed707] | 
committer: Michael Niedermayer

avcodec/v408enc: remove coded_frame usage

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c
index 14ca619..f37f360 100644
--- a/libavcodec/v408enc.c
+++ b/libavcodec/v408enc.c
@@ -41,9 +41,6 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket 
*pkt,
 return ret;
 dst = pkt->data;
 
-avctx->coded_frame->key_frame = 1;
-avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
-
 y = pic->data[0];
 u = pic->data[1];
 v = pic->data[2];
@@ -89,6 +86,7 @@ AVCodec ff_ayuv_encoder = {
 .encode2  = v408_encode_frame,
 .close= v408_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVA444P, 
AV_PIX_FMT_NONE },
+.capabilities = AV_CODEC_CAP_INTRA_ONLY,
 };
 #endif
 #if CONFIG_V408_ENCODER
@@ -101,5 +99,6 @@ AVCodec ff_v408_encoder = {
 .encode2  = v408_encode_frame,
 .close= v408_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVA444P, 
AV_PIX_FMT_NONE },
+.capabilities = AV_CODEC_CAP_INTRA_ONLY,
 };
 #endif

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

[FFmpeg-cvslog] avcodec/y41penc: Drop coded_frame usage

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 16:14:23 2015 +0200| [77d8fd5c9c1d71b3995262dd737b248432ef5e3a] | 
committer: Michael Niedermayer

avcodec/y41penc: Drop coded_frame usage

Signed-off-by: Michael Niedermayer 

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

 libavcodec/y41penc.c |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/y41penc.c b/libavcodec/y41penc.c
index 0645d27..94acc34 100644
--- a/libavcodec/y41penc.c
+++ b/libavcodec/y41penc.c
@@ -45,8 +45,6 @@ static int y41p_encode_frame(AVCodecContext *avctx, AVPacket 
*pkt,
 if ((ret = ff_alloc_packet2(avctx, pkt, avctx->width * avctx->height * 
1.5, 0)) < 0)
 return ret;
 
-avctx->coded_frame->key_frame = 1;
-avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 dst = pkt->data;
 
 for (i = avctx->height - 1; i >= 0; i--) {
@@ -91,4 +89,5 @@ AVCodec ff_y41p_encoder = {
 .close= y41p_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV411P,
  AV_PIX_FMT_NONE },
+.capabilities = AV_CODEC_CAP_INTRA_ONLY,
 };

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

[FFmpeg-cvslog] avcodec/yuv4enc: drop coded_frame usage

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 16:14:06 2015 +0200| [9ebffc5bba362df9d13b43fe3e37d6b2860b7803] | 
committer: Michael Niedermayer

avcodec/yuv4enc: drop coded_frame usage

Signed-off-by: Michael Niedermayer 

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

 libavcodec/yuv4enc.c |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c
index 17c670f..cc8846d 100644
--- a/libavcodec/yuv4enc.c
+++ b/libavcodec/yuv4enc.c
@@ -39,9 +39,6 @@ static int yuv4_encode_frame(AVCodecContext *avctx, AVPacket 
*pkt,
 return ret;
 dst = pkt->data;
 
-avctx->coded_frame->key_frame = 1;
-avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
-
 y = pic->data[0];
 u = pic->data[1];
 v = pic->data[2];
@@ -79,4 +76,5 @@ AVCodec ff_yuv4_encoder = {
 .encode2  = yuv4_encode_frame,
 .close= yuv4_encode_close,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P, 
AV_PIX_FMT_NONE },
+.capabilities = AV_CODEC_CAP_INTRA_ONLY,
 };

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

[FFmpeg-cvslog] Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf'

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 16:23:09 2015 +0200| [8e67599505e3b0a968227a1dcd40020dff874001] | 
committer: Michael Niedermayer

Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf'

* commit '5ae178539b91d25710b7bb322d156c31aea9f8bf':
  http: Add the trailing endlines if they are missing

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] http: Add the trailing endlines if they are missing

2015-07-30 Thread Luca Barbato

ffmpeg | branch: master | Luca Barbato  | Thu Jul 23 
21:14:09 2015 +0200| [5ae178539b91d25710b7bb322d156c31aea9f8bf] | committer: 
Luca Barbato

http: Add the trailing endlines if they are missing

Makes slightly easier the life of those want to use the option
from the command line

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

 libavformat/http.c |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavformat/http.c b/libavformat/http.c
index 3b9aa2d..b3e9771 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -287,9 +287,16 @@ static int http_open(URLContext *h, const char *uri, int 
flags,
 
 if (s->headers) {
 int len = strlen(s->headers);
-if (len < 2 || strcmp("\r\n", s->headers + len - 2))
+if (len < 2 || strcmp("\r\n", s->headers + len - 2)) {
 av_log(h, AV_LOG_WARNING,
"No trailing CRLF found in HTTP header.\n");
+ret = av_reallocp(&s->headers, len + 3);
+if (ret < 0)
+return ret;
+s->headers[len] = '\r';
+s->headers[len + 1] = '\n';
+s->headers[len + 2] = '\0';
+}
 }
 
 ret = http_open_cnx(h, options);

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

[FFmpeg-cvslog] Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 17:42:19 2015 +0200| [ba12ba859aabfa7153ba397d869db13acdaba340] | 
committer: Michael Niedermayer

Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744'

* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
libavformat/hls.c

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] hls: Save and forward avio options

2015-07-30 Thread Luca Barbato

ffmpeg | branch: master | Luca Barbato  | Thu Jul 23 
21:11:58 2015 +0200| [0c73a5a53cc97f4291bbe9e1e68226edf6161744] | committer: 
Luca Barbato

hls: Save and forward avio options

Make possible to send the custom headers and override the user agent.

Reported-by: BenWonder

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

 libavformat/hls.c |   93 +
 1 file changed, 80 insertions(+), 13 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index 8b52a35..467a491 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -103,6 +103,7 @@ typedef struct HLSContext {
 int64_t seek_timestamp;
 int seek_flags;
 AVIOInterruptCB *interrupt_callback;
+AVDictionary *avio_opts;
 } HLSContext;
 
 static int read_chomp_line(AVIOContext *s, char *buf, int maxlen)
@@ -199,6 +200,51 @@ static void handle_key_args(struct key_info *info, const 
char *key,
 }
 }
 
+static int open_in(HLSContext *c, AVIOContext **in, const char *url)
+{
+AVDictionary *tmp = NULL;
+int ret;
+
+av_dict_copy(&tmp, c->avio_opts, 0);
+
+ret = avio_open2(in, url, AVIO_FLAG_READ, c->interrupt_callback, &tmp);
+
+av_dict_free(&tmp);
+return ret;
+}
+
+static int url_connect(struct variant *var, AVDictionary *opts)
+{
+AVDictionary *tmp = NULL;
+int ret;
+
+av_dict_copy(&tmp, opts, 0);
+
+av_opt_set_dict(var->input, &tmp);
+
+if ((ret = ffurl_connect(var->input, NULL)) < 0) {
+ffurl_close(var->input);
+var->input = NULL;
+}
+
+av_dict_free(&tmp);
+return ret;
+}
+
+static int open_url(HLSContext *c, URLContext **uc, const char *url)
+{
+AVDictionary *tmp = NULL;
+int ret;
+
+av_dict_copy(&tmp, c->avio_opts, 0);
+
+ret = ffurl_open(uc, url, AVIO_FLAG_READ, c->interrupt_callback, &tmp);
+
+av_dict_free(&tmp);
+
+return ret;
+}
+
 static int parse_playlist(HLSContext *c, const char *url,
   struct variant *var, AVIOContext *in)
 {
@@ -214,10 +260,10 @@ static int parse_playlist(HLSContext *c, const char *url,
 uint8_t *new_url = NULL;
 
 if (!in) {
-close_in = 1;
-if ((ret = avio_open2(&in, url, AVIO_FLAG_READ,
-  c->interrupt_callback, NULL)) < 0)
+ret = open_in(c, &in, url);
+if (ret < 0)
 return ret;
+close_in = 1;
 }
 
 if (av_opt_get(in, "location", AV_OPT_SEARCH_CHILDREN, &new_url) >= 0)
@@ -333,15 +379,14 @@ static int open_input(struct variant *var)
 {
 struct segment *seg = var->segments[var->cur_seq_no - var->start_seq_no];
 if (seg->key_type == KEY_NONE) {
-return ffurl_open(&var->input, seg->url, AVIO_FLAG_READ,
-  &var->parent->interrupt_callback, NULL);
+return  open_url(var->parent->priv_data, &var->input, seg->url);
 } else if (seg->key_type == KEY_AES_128) {
+HLSContext *c = var->parent->priv_data;
 char iv[33], key[33], url[MAX_URL_SIZE];
 int ret;
 if (strcmp(seg->key, var->key_url)) {
 URLContext *uc;
-if (ffurl_open(&uc, seg->key, AVIO_FLAG_READ,
-   &var->parent->interrupt_callback, NULL) == 0) {
+if (open_url(var->parent->priv_data, &uc, seg->key) == 0) {
 if (ffurl_read_complete(uc, var->key, sizeof(var->key))
 != sizeof(var->key)) {
 av_log(NULL, AV_LOG_ERROR, "Unable to read key file %s\n",
@@ -366,12 +411,8 @@ static int open_input(struct variant *var)
 return ret;
 av_opt_set(var->input->priv_data, "key", key, 0);
 av_opt_set(var->input->priv_data, "iv", iv, 0);
-if ((ret = ffurl_connect(var->input, NULL)) < 0) {
-ffurl_close(var->input);
-var->input = NULL;
-return ret;
-}
-return 0;
+
+return url_connect(var, c->avio_opts);
 }
 return AVERROR(ENOSYS);
 }
@@ -449,6 +490,26 @@ reload:
 goto restart;
 }
 
+static int save_avio_options(AVFormatContext *s)
+{
+HLSContext *c = s->priv_data;
+const char *opts[] = { "headers", "user_agent", NULL }, **opt = opts;
+uint8_t *buf;
+int ret = 0;
+
+while (*opt) {
+if (av_opt_get(s->pb, *opt, AV_OPT_SEARCH_CHILDREN, &buf) >= 0) {
+ret = av_dict_set(&c->avio_opts, *opt, buf,
+  AV_DICT_DONT_STRDUP_VAL);
+if (ret < 0)
+return ret;
+}
+opt++;
+}
+
+return ret;
+}
+
 static int hls_read_header(AVFormatContext *s)
 {
 HLSContext *c = s->priv_data;
@@ -459,6 +520,9 @@ static int hls_read_header(AVFormatContext *s)
 if ((ret = parse_playlist(c, s->filename, NULL, s->pb)) < 0)
 goto fail;
 
+if ((ret = save_avio_options(s)) < 0)
+goto fail;
+
 if (c->n_variants == 0) {
 av_log(NULL, AV_

[FFmpeg-cvslog] Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 18:28:43 2015 +0200| [d560c61125b3ee0ec8cd2e228f0604b63f85b8b2] | 
committer: Michael Niedermayer

Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b'

* commit '6877537ff321136cf78ab03b8b91e6b6f218db5b':
  hmac: add missing version bump and APIChanges entry

Conflicts:
libavutil/version.h

version.h is not changed as the code has been added 2 years ago in FFmpeg

See: 82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] hmac: add missing version bump and APIChanges entry

2015-07-30 Thread James Almer

ffmpeg | branch: master | James Almer  | Thu Jul 30 04:02:23 
2015 -0300| [6877537ff321136cf78ab03b8b91e6b6f218db5b] | committer: Martin 
Storsjö

hmac: add missing version bump and APIChanges entry

Signed-off-by: James Almer 
Signed-off-by: Martin Storsjö 

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

 doc/APIchanges  |3 +++
 libavutil/version.h |2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 4ee7f41..17a6d88 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2014-08-09
 
 API changes, most recent first:
 
+2015-07-29 - 7e38340 - lavu 54.16.0 - hmac.h
+  Add AV_HMAC_SHA224 and AV_HMAC_SHA256.
+
 2015-xx-xx - lavc 56.35.0 - avcodec.h
   x - Rename CODEC_FLAG* defines to AV_CODEC_FLAG*.
   x - Rename CODEC_CAP_* defines to AV_CODEC_CAP_*.
diff --git a/libavutil/version.h b/libavutil/version.h
index 4c3b7f4..231cf94 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -54,7 +54,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR 54
-#define LIBAVUTIL_VERSION_MINOR 15
+#define LIBAVUTIL_VERSION_MINOR 16
 #define LIBAVUTIL_VERSION_MICRO  0
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

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

[FFmpeg-cvslog] rtsp: Only interpret $ as interleaved packet indicator at the start of replies

2015-07-30 Thread Martin Storsjö

ffmpeg | branch: master | Martin Storsjö  | Wed Jan 21 
13:05:43 2015 +0100| [764ec70149728be82304c163ccc4e280f1629201] | committer: 
Martin Storsjö

rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Allow $ as character anywhere within normal RTSP replies - both
within the lines, and as the first character of RTSP header lines.
(The existing old comment indicated that an inline packet could
start at any line within a RTSP reply header, but that doesn't
sound valid to me, and I'm not sure if the existing code
handled that correctly either.)

CC: libav-sta...@libav.org
Signed-off-by: Martin Storsjö 

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

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

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index cbea685..90a6b75 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1128,6 +1128,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, 
RTSPMessageHeader *reply,
 unsigned char ch;
 const char *p;
 int ret, content_length, line_count = 0, request = 0;
+int first_line = 1;
 unsigned char *content = NULL;
 
 start:
@@ -1147,8 +1148,7 @@ start:
 return AVERROR_EOF;
 if (ch == '\n')
 break;
-if (ch == '$') {
-/* XXX: only parse it if first char on line ? */
+if (ch == '$' && first_line && q == buf) {
 if (return_on_interleaved_data) {
 return 1;
 } else
@@ -1159,6 +1159,7 @@ start:
 }
 }
 *q = '\0';
+first_line = 0;
 
 av_log(s, AV_LOG_TRACE, "line='%s'\n", buf);
 

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

[FFmpeg-cvslog] Merge commit '764ec70149728be82304c163ccc4e280f1629201'

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 18:37:34 2015 +0200| [bc4bdc6d61527e9e1bd2ff6d39ee68eac68ff9de] | 
committer: Michael Niedermayer

Merge commit '764ec70149728be82304c163ccc4e280f1629201'

* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] avidec: check for valid bit_rate range

2015-07-30 Thread Andreas Cadhalpun

ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Mon May  4 21:07:52 2015 +0200| 
[74a88a509c6e60bec20cb74291b69b9d5dff0a0d] | committer: Andreas Cadhalpun

avidec: check for valid bit_rate range

If bit_rate is negative, it can trigger an av_assert2 in av_rescale_rnd.

Since av_rescale returns int64_t, but st->codec_bit_rate is int, it can
also overflow into a negative value.

Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 0eec40b713eee84e2aec8af35ccce059817cad2a)
Signed-off-by: Andreas Cadhalpun 

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

 libavformat/avidec.c |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 91e8514..621bd5f 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -448,6 +448,7 @@ static int calculate_bitrate(AVFormatContext *s)
 int64_t len = 0;
 AVStream *st = s->streams[i];
 int64_t duration;
+int64_t bitrate;
 
 for (j = 0; j < st->nb_index_entries; j++)
 len += st->index_entries[j].size;
@@ -455,7 +456,10 @@ static int calculate_bitrate(AVFormatContext *s)
 if (st->nb_index_entries < 2 || st->codec->bit_rate > 0)
 continue;
 duration = st->index_entries[j-1].timestamp - 
st->index_entries[0].timestamp;
-st->codec->bit_rate = av_rescale(8*len, st->time_base.den, duration * 
st->time_base.num);
+bitrate = av_rescale(8*len, st->time_base.den, duration * 
st->time_base.num);
+if (bitrate <= INT_MAX && bitrate > 0) {
+st->codec->bit_rate = bitrate;
+}
 }
 return 1;
 }

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

[FFmpeg-cvslog] mpegaudiodec: copy AVFloatDSPContext from first context to all contexts

2015-07-30 Thread Andreas Cadhalpun

ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Fri Jun 26 00:27:54 2015 +0200| 
[98aedbf9fe38dac810cb94e3ee1217fad3088c53] | committer: Andreas Cadhalpun

mpegaudiodec: copy AVFloatDSPContext from first context to all contexts

This fixes a segfault when decoding multi-channel MP3onMP4 files.

This is similar to commit cb72230d for MPADSPContext.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit 151dbe4579601a81662b4b366d0e10df3c00027a)
Signed-off-by: Andreas Cadhalpun 

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

 libavcodec/mpegaudiodec_template.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/mpegaudiodec_template.c 
b/libavcodec/mpegaudiodec_template.c
index 138a107..0aa14b7 100644
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -1893,6 +1893,7 @@ static av_cold int decode_init_mp3on4(AVCodecContext * 
avctx)
 s->mp3decctx[i]->adu_mode = 1;
 s->mp3decctx[i]->avctx = avctx;
 s->mp3decctx[i]->mpadsp = s->mp3decctx[0]->mpadsp;
+s->mp3decctx[i]->fdsp = s->mp3decctx[0]->fdsp;
 }
 
 return 0;

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

[FFmpeg-cvslog] huffyuvdec: validate image size

2015-07-30 Thread Andreas Cadhalpun

ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Sun Jun 28 11:21:54 2015 +0200| 
[d8c82ed321da59469406327f33c8d580ef32186f] | committer: Andreas Cadhalpun

huffyuvdec: validate image size

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit 9a345802edf7f430b3335f486aecdd8552f8367b)
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index 98c6128..a99ac71 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -37,6 +37,7 @@
 #include "huffyuv.h"
 #include "huffyuvdsp.h"
 #include "thread.h"
+#include "libavutil/imgutils.h"
 #include "libavutil/pixdesc.h"
 
 #define classic_shift_luma_table_size 42
@@ -291,6 +292,10 @@ static av_cold int decode_init(AVCodecContext *avctx)
 HYuvContext *s = avctx->priv_data;
 int ret;
 
+ret = av_image_check_size(avctx->width, avctx->height, 0, avctx);
+if (ret < 0)
+return ret;
+
 ff_huffyuvdsp_init(&s->hdsp);
 memset(s->vlc, 0, 4 * sizeof(VLC));
 

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

[FFmpeg-cvslog] vc1dec: use get_bits_long and limit the read bits to 32

2015-07-30 Thread Andreas Cadhalpun

ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Thu Jun 25 22:47:38 2015 +0200| 
[983dc64772a0d1ae621b48d926daa903171a718b] | committer: Andreas Cadhalpun

vc1dec: use get_bits_long and limit the read bits to 32

get_bits should not be used with more than 25 bits.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit 1f1e0a2971b2a01f275bb5088c2e36166514be64)
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index da6724c..e5725b4 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -465,7 +465,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
 count = avctx->extradata_size*8 - get_bits_count(&gb);
 if (count > 0) {
 av_log(avctx, AV_LOG_INFO, "Extra data: %i bits left, value: %X\n",
-   count, get_bits(&gb, count));
+   count, get_bits_long(&gb, FFMIN(count, 32)));
 } else if (count < 0) {
 av_log(avctx, AV_LOG_INFO, "Read %i bits in overflow\n", -count);
 }

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

[FFmpeg-cvslog] avformat/nut: support WavPack

2015-07-30 Thread Paul B Mahol

ffmpeg | branch: release/2.5 | Paul B Mahol  | Tue Jan 27 
18:09:32 2015 +| [ff68bf7a1bf32bd497f758c231fd7d816f07d86c] | committer: 
Andreas Cadhalpun

avformat/nut: support WavPack

Signed-off-by: Paul B Mahol 
(cherry picked from commit 64815d1f0c782a632447806e40d9c7ee71f31b92)
Signed-off-by: Andreas Cadhalpun 

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

 libavformat/nut.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/nut.c b/libavformat/nut.c
index 86a0301..6cd3445 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -182,6 +182,7 @@ const AVCodecTag ff_nut_audio_extra_tags[] = {
 { AV_CODEC_ID_PCM_ALAW, MKTAG('A', 'L', 'A', 'W') },
 { AV_CODEC_ID_PCM_MULAW,MKTAG('U', 'L', 'A', 'W') },
 { AV_CODEC_ID_MP3,  MKTAG('M', 'P', '3', ' ') },
+{ AV_CODEC_ID_WAVPACK,  MKTAG('w', 'v', 'p', 'k') },
 { AV_CODEC_ID_NONE, 0 }
 };
 

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

[FFmpeg-cvslog] avcodec/diracdec: Check slices malloc and propagate error code

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: release/2.5 | Michael Niedermayer  | Sat Jan 
10 17:25:05 2015 +0100| [ef905b1b27d5785930d130ad786fd99514d207a7] | committer: 
Andreas Cadhalpun

avcodec/diracdec: Check slices malloc and propagate error code

Signed-off-by: Michael Niedermayer 
(cherry picked from commit a4d3cf10b2ece441ae25849a66b1c11d838f9381)
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 6b93d86..9640c82 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -772,7 +772,7 @@ static int decode_lowdelay_slice(AVCodecContext *avctx, 
void *arg)
  * Dirac Specification ->
  * 13.5.1 low_delay_transform_data()
  */
-static void decode_lowdelay(DiracContext *s)
+static int decode_lowdelay(DiracContext *s)
 {
 AVCodecContext *avctx = s->avctx;
 int slice_x, slice_y, bytes, bufsize;
@@ -781,6 +781,8 @@ static void decode_lowdelay(DiracContext *s)
 int slice_num = 0;
 
 slices = av_mallocz_array(s->lowdelay.num_x, s->lowdelay.num_y * 
sizeof(struct lowdelay_slice));
+if (!slices)
+return AVERROR(ENOMEM);
 
 align_get_bits(&s->gb);
 /*[DIRAC_STD] 13.5.2 Slices. slice(sx,sy) */
@@ -811,6 +813,7 @@ static void decode_lowdelay(DiracContext *s)
 intra_dc_prediction(&s->plane[1].band[0][0]);  /* [DIRAC_STD] 13.3 
intra_dc_prediction() */
 intra_dc_prediction(&s->plane[2].band[0][0]);  /* [DIRAC_STD] 13.3 
intra_dc_prediction() */
 av_free(slices);
+return 0;
 }
 
 static void init_planes(DiracContext *s)
@@ -1606,6 +1609,7 @@ static int dirac_decode_frame_internal(DiracContext *s)
 {
 DWTContext d;
 int y, i, comp, dsty;
+int ret;
 
 if (s->low_delay) {
 /* [DIRAC_STD] 13.5.1 low_delay_transform_data() */
@@ -1613,8 +1617,10 @@ static int dirac_decode_frame_internal(DiracContext *s)
 Plane *p = &s->plane[comp];
 memset(p->idwt_buf, 0, p->idwt_stride * p->idwt_height * 
sizeof(IDWTELEM));
 }
-if (!s->zero_res)
-decode_lowdelay(s);
+if (!s->zero_res) {
+if ((ret = decode_lowdelay(s)) < 0)
+return ret;
+}
 }
 
 for (comp = 0; comp < 3; comp++) {

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

[FFmpeg-cvslog] libshine: fix support for shine 3.0

2015-07-30 Thread Andreas Cadhalpun

ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Sun May 24 15:44:31 2015 +0200| 
[18189ebab3cfb2f2fe8ff53a404557bc5f7a12c6] | committer: Andreas Cadhalpun

libshine: fix support for shine 3.0

shine_encode_buffer expects written to be an int pointer, while the
previous shine_encode_frame expected it to be a long pointer.

Thus encoding with libshine currently always fails with
"internal buffer too small", because a negative return value of
shine_encode_buffer is interpreted as a very large long value.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit e48a9ac9af5f6e652735aa44a86420b5e7258895)
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c
index 48333bb..27c1a5f 100644
--- a/libavcodec/libshine.c
+++ b/libavcodec/libshine.c
@@ -71,7 +71,7 @@ static int libshine_encode_frame(AVCodecContext *avctx, 
AVPacket *avpkt,
 SHINEContext *s = avctx->priv_data;
 MPADecodeHeader hdr;
 unsigned char *data;
-long written;
+int written;
 int ret, len;
 
 if (frame)

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

[FFmpeg-cvslog] Changelog update

2015-07-30 Thread Andreas Cadhalpun

ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Thu Jul 30 18:54:25 2015 +0200| 
[5e833d958c09e79be873f40df88d75425132ba16] | committer: Andreas Cadhalpun

Changelog update

Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/Changelog b/Changelog
index 9cfeeff..8d010d9 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,14 @@ Entries are sorted chronologically from oldest to youngest 
within each release,
 releases are sorted from youngest to oldest.
 
 version 2.5.8
+- snow: remove an obsolete av_assert2
+- huffyuvdec: validate image size
+- vc1dec: use get_bits_long and limit the read bits to 32
+- mpegaudiodec: copy AVFloatDSPContext from first context to all contexts
+- libshine: fix support for shine 3.0
+- avidec: check for valid bit_rate range
+- avformat/nut: support WavPack
+- avcodec/diracdec: Check slices malloc and propagate error code
 - avcodec/vp8: Check buffer size in vp8_decode_frame_header()
 - avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free()
 - avcodec/diracdec: Check for hpel_base allocation failure

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

[FFmpeg-cvslog] snow: remove an obsolete av_assert2

2015-07-30 Thread Andreas Cadhalpun

ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Thu Jul  9 19:50:34 2015 +0200| 
[ffcfab882b6683278585fd41218c1803dea443f5] | committer: Andreas Cadhalpun

snow: remove an obsolete av_assert2

It asserts that the frame linesize is larger than 37, but it can be
smaller and decoding such frames works.

Before commit cc884a35 src_stride > 7*MB_SIZE was necessary, because the
blocks were interleaved in the tmp buffer and the last block was added
with an offset of 6*MB_SIZE.
It was changed for src_stride <= 7*MB_SIZE to write the blocks
sequentially, hence the larger tmp_step.
After that the assert was only necessary to make sure that the buffer
remained large enough.
Since commit bd2b6b33 s->scratchbuf is used as tmp buffer.
As part of commit 86e107a7 the minimal scratchbuf size was increased to
256*7*MB_SIZE, which is enough for any src_stride <= 7*MB_SIZE.

Also add a comment explaining the tmp_step calculation.

Signed-off-by: Andreas Cadhalpun 
(cherry picked from commit 3526a120f92929cb0a4009e403ee2f141030c487)
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index 6f1fca3..12aad18 100644
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -298,6 +298,8 @@ static av_always_inline void add_yblock(SnowContext *s, int 
sliced, slice_buffer
 BlockNode *lb= lt+b_stride;
 BlockNode *rb= lb+1;
 uint8_t *block[4];
+// When src_stride is large enough, it is possible to interleave the 
blocks.
+// Otherwise the blocks are written sequentially in the tmp buffer.
 int tmp_step= src_stride >= 7*MB_SIZE ? MB_SIZE : MB_SIZE*src_stride;
 uint8_t *tmp = s->scratchbuf;
 uint8_t *ptmp;
@@ -341,8 +343,6 @@ static av_always_inline void add_yblock(SnowContext *s, int 
sliced, slice_buffer
 
 if(b_w<=0 || b_h<=0) return;
 
-av_assert2(src_stride > 2*MB_SIZE + 5);
-
 if(!sliced && offset_dst)
 dst += src_x + src_y*dst_stride;
 dst8+= src_x + src_y*src_stride;

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

[FFmpeg-cvslog] rawdec: fix mjpeg probing buffer size check

2015-07-30 Thread wm4

ffmpeg | branch: release/2.5 | wm4  | Wed Jul 29 
22:33:44 2015 +0200| [1eb646ec9f87ed488f52561867e107eaee89e20c] | committer: 
Michael Niedermayer

rawdec: fix mjpeg probing buffer size check

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 6a9085a..d8dc1c3 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -191,7 +191,7 @@ static int mjpeg_probe(AVProbeData *p)
 static const char ct_jpeg[] = "\r\nContent-Type: image/jpeg\r\n";
 int i;
 
-for (i=0; ibuf_size - sizeof(ct_jpeg), 100); i++)
+for (i=0; ibuf_size - (int)sizeof(ct_jpeg), 100); i++)
 if (!memcmp(p->buf + i, ct_jpeg, sizeof(ct_jpeg) - 1))
 return AVPROBE_SCORE_EXTENSION;
 

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

[FFmpeg-cvslog] rawdec: fix mjpeg probing

2015-07-30 Thread wm4

ffmpeg | branch: release/2.5 | wm4  | Wed Jul 29 
22:11:18 2015 +0200| [c809cf1c5b1b66fbc14795f3de0dde41c6861356] | committer: 
Michael Niedermayer

rawdec: fix mjpeg probing

There can be other headers than "Content-Type:" (in this case, a
"Content-Length:" header was following), so checking for a trailing
newline is wrong.

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index bbb76b6..6a9085a 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -188,7 +188,7 @@ static int mjpeg_probe(AVProbeData *p)
 }
 
 if (nb_invalid*4 + 1 < nb_frames) {
-static const char ct_jpeg[] = "\r\nContent-Type: image/jpeg\r\n\r\n";
+static const char ct_jpeg[] = "\r\nContent-Type: image/jpeg\r\n";
 int i;
 
 for (i=0; ibuf_size - sizeof(ct_jpeg), 100); i++)

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

[FFmpeg-cvslog] avcodec/r210enc: Drop coded_frame usage

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 19:57:58 2015 +0200| [802e51299e6d018f2f54c8d14f2b765c7c750496] | 
committer: Michael Niedermayer

avcodec/r210enc: Drop coded_frame usage

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/r210enc.c b/libavcodec/r210enc.c
index 64aa33f..65b3c06 100644
--- a/libavcodec/r210enc.c
+++ b/libavcodec/r210enc.c
@@ -37,8 +37,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 if ((ret = ff_alloc_packet2(avctx, pkt, 4 * aligned_width * avctx->height, 
0)) < 0)
 return ret;
 
-avctx->coded_frame->key_frame = 1;
-avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
 src_line = pic->data[0];
 dst = pkt->data;
 
@@ -77,6 +75,7 @@ AVCodec ff_r210_encoder = {
 .id = AV_CODEC_ID_R210,
 .encode2= encode_frame,
 .pix_fmts   = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, 
AV_PIX_FMT_NONE },
+.capabilities   = AV_CODEC_CAP_INTRA_ONLY,
 };
 #endif
 #if CONFIG_R10K_ENCODER
@@ -87,6 +86,7 @@ AVCodec ff_r10k_encoder = {
 .id = AV_CODEC_ID_R10K,
 .encode2= encode_frame,
 .pix_fmts   = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, 
AV_PIX_FMT_NONE },
+.capabilities   = AV_CODEC_CAP_INTRA_ONLY,
 };
 #endif
 #if CONFIG_AVRP_ENCODER
@@ -97,5 +97,6 @@ AVCodec ff_avrp_encoder = {
 .id = AV_CODEC_ID_AVRP,
 .encode2= encode_frame,
 .pix_fmts   = (const enum AVPixelFormat[]) { AV_PIX_FMT_RGB48, 
AV_PIX_FMT_NONE },
+.capabilities   = AV_CODEC_CAP_INTRA_ONLY,
 };
 #endif

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

[FFmpeg-cvslog] avcodec/avuienc: Drop coded_frame usage

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 19:57:07 2015 +0200| [dfe8e3b3819d90999d3ad6c0c37f7bb0862f414a] | 
committer: Michael Niedermayer

avcodec/avuienc: Drop coded_frame usage

Signed-off-by: Michael Niedermayer 

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

 libavcodec/avuienc.c |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/avuienc.c b/libavcodec/avuienc.c
index 281c2c1..77d5538 100644
--- a/libavcodec/avuienc.c
+++ b/libavcodec/avuienc.c
@@ -70,9 +70,6 @@ static int avui_encode_frame(AVCodecContext *avctx, AVPacket 
*pkt,
 dst += avctx->width * skip;
 }
 
-avctx->coded_frame->key_frame = 1;
-avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I;
-
 for (i = 0; i <= interlaced; i++) {
 uint8_t *src;
 if (interlaced && avctx->height == 486) {
@@ -101,6 +98,6 @@ AVCodec ff_avui_encoder = {
 .id   = AV_CODEC_ID_AVUI,
 .init = avui_encode_init,
 .encode2  = avui_encode_frame,
-.capabilities = AV_CODEC_CAP_EXPERIMENTAL,
+.capabilities = AV_CODEC_CAP_EXPERIMENTAL | AV_CODEC_CAP_INTRA_ONLY,
 .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_UYVY422, 
AV_PIX_FMT_NONE },
 };

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

[FFmpeg-cvslog] Revert "ffmpeg: modify tty state when stderr is redirected"

2015-07-30 Thread Michael Niedermayer

ffmpeg | branch: master | Michael Niedermayer  | Thu 
Jul 30 22:58:35 2015 +0200| [d2077c860e56a5c0239fc5d1699e31ae127b2706] | 
committer: Michael Niedermayer

Revert "ffmpeg: modify tty state when stderr is redirected"

faults in fate otherwise breaks the terminal.
To reproduce, add a abort() into wav_read_header()
run make fate-acodec-adpcm-ima_wav

This reverts commit 92e62f49cf7440a9e8998d284528e223c0948c97.

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

 ffmpeg.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index eb3f613..5575e2f 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -372,7 +372,7 @@ void term_init(void)
 struct termios tty;
 int istty = 1;
 #if HAVE_ISATTY
-istty = isatty(0);
+istty = isatty(0) && isatty(2);
 #endif
 if (istty && tcgetattr (0, &tty) == 0) {
 oldtty = tty;

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

[FFmpeg-cvslog] x86/aacpsdsp: add SSE and SSE3 optimized functions

2015-07-30 Thread James Almer

ffmpeg | branch: master | James Almer  | Sat Jul 25 13:10:25 
2015 -0300| [9dcaae70f2f3ef27a2f0f8fee92114ea5e8847fb] | committer: James Almer

x86/aacpsdsp: add SSE and SSE3 optimized functions

Between 1.5 and 2.5 times faster

Reviewed-by: Michael Niedermayer 
Signed-off-by: James Almer 

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

 libavcodec/aacps.c |4 +-
 libavcodec/aacpsdsp.h  |1 +
 libavcodec/aacpsdsp_template.c |2 +
 libavcodec/x86/Makefile|6 +-
 libavcodec/x86/aacpsdsp.asm|  215 
 libavcodec/x86/aacpsdsp_init.c |   55 ++
 6 files changed, 279 insertions(+), 4 deletions(-)

diff --git a/libavcodec/aacps.c b/libavcodec/aacps.c
index 664330d..1165d9b 100644
--- a/libavcodec/aacps.c
+++ b/libavcodec/aacps.c
@@ -936,8 +936,8 @@ static void stereo_processing(PSContext *ps, INTFLOAT 
(*l)[32][2], INTFLOAT (*r)
 H22[0][e+1][b] = h22;
 }
 for (k = 0; k < NR_BANDS[is34]; k++) {
-INTFLOAT h[2][4];
-INTFLOAT h_step[2][4];
+LOCAL_ALIGNED_16(INTFLOAT, h, [2], [4]);
+LOCAL_ALIGNED_16(INTFLOAT, h_step, [2], [4]);
 int start = ps->border_position[e];
 int stop  = ps->border_position[e+1];
 INTFLOAT width = Q30(1.f) / (stop - start);
diff --git a/libavcodec/aacpsdsp.h b/libavcodec/aacpsdsp.h
index 9e3c5aa..c194bbe 100644
--- a/libavcodec/aacpsdsp.h
+++ b/libavcodec/aacpsdsp.h
@@ -52,5 +52,6 @@ typedef struct PSDSPContext {
 void AAC_RENAME(ff_psdsp_init)(PSDSPContext *s);
 void ff_psdsp_init_arm(PSDSPContext *s);
 void ff_psdsp_init_mips(PSDSPContext *s);
+void ff_psdsp_init_x86(PSDSPContext *s);
 
 #endif /* LIBAVCODEC_AACPSDSP_H */
diff --git a/libavcodec/aacpsdsp_template.c b/libavcodec/aacpsdsp_template.c
index bfec828..3049ce8 100644
--- a/libavcodec/aacpsdsp_template.c
+++ b/libavcodec/aacpsdsp_template.c
@@ -224,5 +224,7 @@ av_cold void AAC_RENAME(ff_psdsp_init)(PSDSPContext *s)
 ff_psdsp_init_arm(s);
 if (ARCH_MIPS)
 ff_psdsp_init_mips(s);
+if (ARCH_X86)
+ff_psdsp_init_x86(s);
 #endif /* !USE_FIXED */
 }
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index a515ebd..c403770 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -38,7 +38,8 @@ OBJS-$(CONFIG_VP8DSP)  += x86/vp8dsp_init.o
 OBJS-$(CONFIG_XMM_CLOBBER_TEST)+= x86/w64xmmtest.o
 
 # decoders/encoders
-OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o
+OBJS-$(CONFIG_AAC_DECODER) += x86/aacpsdsp_init.o  \
+  x86/sbrdsp_init.o
 OBJS-$(CONFIG_ADPCM_G722_DECODER)  += x86/g722dsp_init.o
 OBJS-$(CONFIG_ADPCM_G722_ENCODER)  += x86/g722dsp_init.o
 OBJS-$(CONFIG_APNG_DECODER)+= x86/pngdsp_init.o
@@ -130,7 +131,8 @@ YASM-OBJS-$(CONFIG_VP8DSP) += x86/vp8dsp.o  
\
   x86/vp8dsp_loopfilter.o
 
 # decoders/encoders
-YASM-OBJS-$(CONFIG_AAC_DECODER)+= x86/sbrdsp.o
+YASM-OBJS-$(CONFIG_AAC_DECODER)+= x86/aacpsdsp.o\
+  x86/sbrdsp.o
 YASM-OBJS-$(CONFIG_ADPCM_G722_DECODER) += x86/g722dsp.o
 YASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp.o
 YASM-OBJS-$(CONFIG_APNG_DECODER)   += x86/pngdsp.o
diff --git a/libavcodec/x86/aacpsdsp.asm b/libavcodec/x86/aacpsdsp.asm
new file mode 100644
index 000..d4dfd5b
--- /dev/null
+++ b/libavcodec/x86/aacpsdsp.asm
@@ -0,0 +1,215 @@
+;**
+;* SIMD optimized MPEG-4 Parametric Stereo decoding functions
+;*
+;* Copyright (C) 2015 James Almer
+;*
+;* This file is part of FFmpeg.
+;*
+;* FFmpeg is free software; you can redistribute it and/or
+;* modify it under the terms of the GNU Lesser General Public
+;* License as published by the Free Software Foundation; either
+;* version 2.1 of the License, or (at your option) any later version.
+;*
+;* 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.
+;*
+;* You should have received a copy of the GNU Lesser 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
+;**
+
+%include "libavutil/x86/x86util.asm"
+
+SECTION_RODATA
+
+ps_p1m1p1m1: dd 0, 0x8000, 0, 0x8000
+
+SECTION_TEXT
+
+;*
+;void ff_ps_add_squares_(float *dst, const float (*src)[2], int n);
+;

[FFmpeg-cvslog] mips/hevcdsp: fix string concatenation on macros

2015-07-30 Thread James Almer

ffmpeg | branch: master | James Almer  | Thu Jul 30 19:28:02 
2015 -0300| [a0092cea462ff4f203aaff09c42c6731c6516b44] | committer: James Almer

mips/hevcdsp: fix string concatenation on macros

Needed for old compilers like GCC 4.2

Tested by trac user brad. Fixes ticket #4745

Reviewed-by: Michael Niedermayer 
Signed-off-by: James Almer 

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

 libavcodec/mips/hevc_mc_bi_msa.c   |4 ++--
 libavcodec/mips/hevc_mc_biw_msa.c  |4 ++--
 libavcodec/mips/hevc_mc_uni_msa.c  |4 ++--
 libavcodec/mips/hevc_mc_uniw_msa.c |4 ++--
 libavcodec/mips/hevcdsp_mips.h |   10 +-
 libavcodec/mips/hevcdsp_msa.c  |4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libavcodec/mips/hevc_mc_bi_msa.c b/libavcodec/mips/hevc_mc_bi_msa.c
index 0709b40..8208be3 100644
--- a/libavcodec/mips/hevc_mc_bi_msa.c
+++ b/libavcodec/mips/hevc_mc_bi_msa.c
@@ -4369,7 +4369,7 @@ BI_MC_COPY(64);
 #undef BI_MC_COPY
 
 #define BI_MC(PEL, DIR, WIDTH, TAP, DIR1, FILT_DIR)
\
-void ff_hevc_put_hevc_bi_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,  
\
+void ff_hevc_put_hevc_bi_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,
\
 ptrdiff_t dst_stride,  
\
 uint8_t *src,  
\
 ptrdiff_t src_stride,  
\
@@ -4423,7 +4423,7 @@ BI_MC(epel, v, 32, 4, vt, my);
 #undef BI_MC
 
 #define BI_MC_HV(PEL, DIR, WIDTH, TAP, DIR1)   
\
-void ff_hevc_put_hevc_bi_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,  
\
+void ff_hevc_put_hevc_bi_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,
\
 ptrdiff_t dst_stride,  
\
 uint8_t *src,  
\
 ptrdiff_t src_stride,  
\
diff --git a/libavcodec/mips/hevc_mc_biw_msa.c 
b/libavcodec/mips/hevc_mc_biw_msa.c
index a1deb0e..05a28ec 100644
--- a/libavcodec/mips/hevc_mc_biw_msa.c
+++ b/libavcodec/mips/hevc_mc_biw_msa.c
@@ -5454,7 +5454,7 @@ BI_W_MC_COPY(64);
 #undef BI_W_MC_COPY
 
 #define BI_W_MC(PEL, DIR, WIDTH, TAP, DIR1, FILT_DIR)  
\
-void ff_hevc_put_hevc_bi_w_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,
\
+void ff_hevc_put_hevc_bi_w_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,  
\
   ptrdiff_t
\
   dst_stride,  
\
   uint8_t *src,
\
@@ -5521,7 +5521,7 @@ BI_W_MC(epel, v, 32, 4, vt, my);
 #undef BI_W_MC
 
 #define BI_W_MC_HV(PEL, DIR, WIDTH, TAP, DIR1) 
\
-void ff_hevc_put_hevc_bi_w_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,
\
+void ff_hevc_put_hevc_bi_w_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,  
\
   ptrdiff_t
\
   dst_stride,  
\
   uint8_t *src,
\
diff --git a/libavcodec/mips/hevc_mc_uni_msa.c 
b/libavcodec/mips/hevc_mc_uni_msa.c
index 61a67c9..754fbdb 100644
--- a/libavcodec/mips/hevc_mc_uni_msa.c
+++ b/libavcodec/mips/hevc_mc_uni_msa.c
@@ -3871,7 +3871,7 @@ UNI_MC_COPY(64);
 #undef UNI_MC_COPY
 
 #define UNI_MC(PEL, DIR, WIDTH, TAP, DIR1, FILT_DIR)   
\
-void ff_hevc_put_hevc_uni_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst, 
\
+void ff_hevc_put_hevc_uni_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,   
\
  ptrdiff_t 
\
  dst_stride,   
\
  uint8_t *src, 
\
@@ -3925,7 +3925,7 @@ UNI_MC(epel, v, 32, 4, vt, my);
 #undef UNI_MC
 
 #define UNI_MC_HV(PEL, DIR, WIDTH, TAP, DIR1)   \
-void ff_hevc_put_hevc_uni_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,  \
+void ff_hevc_put_hevc_uni_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,\
  ptrdiff_t  \
  dst_stride,\
  uint8_t *src,  \
diff --git a/libavcodec/mips/hevc_mc_uniw_msa.c 
b/libavcodec/mips/hevc_mc_uniw_msa.c
index 9079630..ce10f41 100644
--- a/libavcodec/mips/hevc_mc_uniw_msa.c
+++ b/libavcodec/mips/hevc_mc_uniw_msa.c
@@ -4687,7 +4687,7 @@ UNIWGT_MC_COPY(64);
 #undef UNIWGT_MC_COPY
 
 #define UNI_W_MC(PEL, DIR,

[FFmpeg-cvslog] mips/hevcdsp: fix string concatenation on macros

2015-07-30 Thread James Almer

ffmpeg | branch: release/2.7 | James Almer  | Thu Jul 30 
19:28:02 2015 -0300| [a3d45dbcc144a221bfa799e07e675cf18151975f] | committer: 
James Almer

mips/hevcdsp: fix string concatenation on macros

Needed for old compilers like GCC 4.2

Tested by trac user brad. Fixes ticket #4745

Reviewed-by: Michael Niedermayer 
Signed-off-by: James Almer 
(cherry picked from commit a0092cea462ff4f203aaff09c42c6731c6516b44)

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

 libavcodec/mips/hevc_mc_bi_msa.c   |4 ++--
 libavcodec/mips/hevc_mc_biw_msa.c  |4 ++--
 libavcodec/mips/hevc_mc_uni_msa.c  |4 ++--
 libavcodec/mips/hevc_mc_uniw_msa.c |4 ++--
 libavcodec/mips/hevcdsp_mips.h |   10 +-
 libavcodec/mips/hevcdsp_msa.c  |4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libavcodec/mips/hevc_mc_bi_msa.c b/libavcodec/mips/hevc_mc_bi_msa.c
index 0709b40..8208be3 100644
--- a/libavcodec/mips/hevc_mc_bi_msa.c
+++ b/libavcodec/mips/hevc_mc_bi_msa.c
@@ -4369,7 +4369,7 @@ BI_MC_COPY(64);
 #undef BI_MC_COPY
 
 #define BI_MC(PEL, DIR, WIDTH, TAP, DIR1, FILT_DIR)
\
-void ff_hevc_put_hevc_bi_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,  
\
+void ff_hevc_put_hevc_bi_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,
\
 ptrdiff_t dst_stride,  
\
 uint8_t *src,  
\
 ptrdiff_t src_stride,  
\
@@ -4423,7 +4423,7 @@ BI_MC(epel, v, 32, 4, vt, my);
 #undef BI_MC
 
 #define BI_MC_HV(PEL, DIR, WIDTH, TAP, DIR1)   
\
-void ff_hevc_put_hevc_bi_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,  
\
+void ff_hevc_put_hevc_bi_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,
\
 ptrdiff_t dst_stride,  
\
 uint8_t *src,  
\
 ptrdiff_t src_stride,  
\
diff --git a/libavcodec/mips/hevc_mc_biw_msa.c 
b/libavcodec/mips/hevc_mc_biw_msa.c
index a1deb0e..05a28ec 100644
--- a/libavcodec/mips/hevc_mc_biw_msa.c
+++ b/libavcodec/mips/hevc_mc_biw_msa.c
@@ -5454,7 +5454,7 @@ BI_W_MC_COPY(64);
 #undef BI_W_MC_COPY
 
 #define BI_W_MC(PEL, DIR, WIDTH, TAP, DIR1, FILT_DIR)  
\
-void ff_hevc_put_hevc_bi_w_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,
\
+void ff_hevc_put_hevc_bi_w_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,  
\
   ptrdiff_t
\
   dst_stride,  
\
   uint8_t *src,
\
@@ -5521,7 +5521,7 @@ BI_W_MC(epel, v, 32, 4, vt, my);
 #undef BI_W_MC
 
 #define BI_W_MC_HV(PEL, DIR, WIDTH, TAP, DIR1) 
\
-void ff_hevc_put_hevc_bi_w_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,
\
+void ff_hevc_put_hevc_bi_w_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,  
\
   ptrdiff_t
\
   dst_stride,  
\
   uint8_t *src,
\
diff --git a/libavcodec/mips/hevc_mc_uni_msa.c 
b/libavcodec/mips/hevc_mc_uni_msa.c
index 7d02ce8..545e8ae 100644
--- a/libavcodec/mips/hevc_mc_uni_msa.c
+++ b/libavcodec/mips/hevc_mc_uni_msa.c
@@ -3871,7 +3871,7 @@ UNI_MC_COPY(64);
 #undef UNI_MC_COPY
 
 #define UNI_MC(PEL, DIR, WIDTH, TAP, DIR1, FILT_DIR)   
\
-void ff_hevc_put_hevc_uni_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst, 
\
+void ff_hevc_put_hevc_uni_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,   
\
  ptrdiff_t 
\
  dst_stride,   
\
  uint8_t *src, 
\
@@ -3925,7 +3925,7 @@ UNI_MC(epel, v, 32, 4, vt, my);
 #undef UNI_MC
 
 #define UNI_MC_HV(PEL, DIR, WIDTH, TAP, DIR1)   \
-void ff_hevc_put_hevc_uni_##PEL##_##DIRWIDTH##_8_msa(uint8_t *dst,  \
+void ff_hevc_put_hevc_uni_##PEL##_##DIR##WIDTH##_8_msa(uint8_t *dst,\
  ptrdiff_t  \
  dst_stride,\
  uint8_t *src,  \
diff --git a/libavcodec/mips/hevc_mc_uniw_msa.c 
b/libavcodec/mips/hevc_mc_uniw_msa.c
index 9079630..ce10f41 100644
--- a/libavcodec/mips/hevc_mc_uniw_msa.c
+++ b/libavcodec/mips/hevc_mc_uniw_msa.c
@@ -4687,7 +4687,7

[FFmpeg-cvslog] Tag n2.5.8 : FFmpeg 2.5.8 release

2015-07-30 Thread git

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

Tagger: Michael Niedermayer 
Date:   Fri Jul 31 02:26:43 2015 +0200

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

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 0424215 web/download: add FFmpeg 2.5.8

2015-07-30 Thread ffmpeg-cvslog

The branch, master has been updated
   via  042421572f608a52bcc4d05de40ed60577b2394d (commit)
  from  9be302acb0a26c12dd4c4302fd27b5aa35464dcb (commit)


- Log -
commit 042421572f608a52bcc4d05de40ed60577b2394d
Author: Michael Niedermayer 
AuthorDate: Fri Jul 31 02:50:05 2015 +0200
Commit: Michael Niedermayer 
CommitDate: Fri Jul 31 02:50:05 2015 +0200

web/download: add FFmpeg 2.5.8

diff --git a/src/download b/src/download
index 7fd2d3d..244bcff 100644
--- a/src/download
+++ b/src/download
@@ -350,10 +350,10 @@ libpostproc53.  3.100
 
 
   
-FFmpeg 2.5.7 "Bohr"
+FFmpeg 2.5.8 "Bohr"
 
   
-2.5.7 was released on 2015-05-23. It is the latest stable FFmpeg release
+2.5.8 was released on 2015-07-31. It is the latest stable FFmpeg release
 from the 2.5 release branch, which was cut from master on 2014-12-15.
 Amongst lots of other changes, it includes all changes from
 ffmpeg-mt, libav master of 2014-12-03, libav 11 as of 2014-12-03.
@@ -372,16 +372,20 @@ libswresample   1.  1.100
 libpostproc53.  3.100
 
   
-
-  Download 
bzip2 tarball
-  PGP 
signature
+
+  Download 
xz tarball
+  PGP 
signature
  
-
-  Download 
gzip tarball
-  PGP 
signature
+
+  Download 
bzip2 tarball
+  PGP 
signature
  
-
-  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.5.7";>Changelog
+
+  Download 
gzip tarball
+  PGP 
signature
+ 
+
+  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.5.8";>Changelog
   http://git.videolan.org/?p=ffmpeg.git;a=blob;f=RELEASE_NOTES;hb=release/2.5";>Release
 Notes
  


---

Summary of changes:
 src/download | 24 ++--
 1 file changed, 14 insertions(+), 10 deletions(-)


hooks/post-receive
-- 

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

[FFmpeg-cvslog] avformat/wavdec: add extra sample count check for G.729 files

2015-07-30 Thread Ganesh Ajjanagadde

ffmpeg | branch: master | Ganesh Ajjanagadde  | Thu Jul 
30 20:33:28 2015 -0400| [c1bfb99ff2445c7f3ba319ea342dd8004345d67a] | committer: 
Michael Niedermayer

avformat/wavdec: add extra sample count check for G.729 files

Can be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde 
Signed-off-by: Michael Niedermayer 

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

 libavformat/wavdec.c |7 +++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 1803b5c..8b48fc8 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -440,6 +440,13 @@ break_loop:
 sample_count = 0;
 }
 
+/* G.729 hack (for Ticket4577)
+ * FIXME: Come up with cleaner, more general solution */
+if (st->codec->codec_id == AV_CODEC_ID_G729 && sample_count && (data_size 
<< 3) > sample_count) {
+av_log(s, AV_LOG_WARNING, "ignoring wrong sample_count %"PRId64"\n", 
sample_count);
+sample_count = 0;
+}
+
 if (!sample_count || av_get_exact_bits_per_sample(st->codec->codec_id) > 0)
 if (   st->codec->channels
 && data_size

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

Re: [FFmpeg-cvslog] ffplay: Use sws_scale to scale subtitles

2015-07-30 Thread Michael Niedermayer

On Wed, Jul 29, 2015 at 09:36:03PM +, Carl Eugen Hoyos wrote:
> Michael Niedermayer  videolan.org> writes:
> 
> > Fixes some files from Ticket679
> 
> It fixes all samples for me, which one does not work for you?

with a 2nd commit it fixes all for me too, this alone didnt though

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User
questions about the command line tools should be sent to the ffmpeg-user ML.
And questions about how to use libav* should be sent to the libav-user ML.

signature.asc
Description: Digital signature
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

38 matches

Mail list logo