[FFmpeg-cvslog] avcodec/libx264: Avoid reconfig on equivalent aspect ratios

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Thu Jun 18 
14:40:11 2015 +0200| [7b1c03aa744f1f82fe30ea2cd2aeef2ea01d5ce9] | committer: 
Michael Niedermayer

avcodec/libx264: Avoid reconfig on equivalent aspect ratios

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 220d43e..4f34d06 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -170,8 +170,7 @@ static void reconfig_encoder(AVCodecContext *ctx, const 
AVFrame *frame)
 x4->params.b_tff = frame->top_field_first;
 x264_encoder_reconfig(x4->enc, &x4->params);
 }
-if (x4->params.vui.i_sar_height != ctx->sample_aspect_ratio.den ||
-x4->params.vui.i_sar_width  != ctx->sample_aspect_ratio.num) {
+if (x4->params.vui.i_sar_height*ctx->sample_aspect_ratio.num != 
ctx->sample_aspect_ratio.den * x4->params.vui.i_sar_width) {
 x4->params.vui.i_sar_height = ctx->sample_aspect_ratio.den;
 x4->params.vui.i_sar_width  = ctx->sample_aspect_ratio.num;
 x264_encoder_reconfig(x4->enc, &x4->params);

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

[FFmpeg-cvslog] avcodec/hevc_ps: Only discard overread VPS if a previous is available

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Thu Jun 18 
18:03:21 2015 +0200| [57078e4d255a06246fef27846073f5ffb312b5dc] | committer: 
Michael Niedermayer

avcodec/hevc_ps: Only discard overread VPS if a previous is available

Fixes Ticket4621

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index ced0600..757f666 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -499,7 +499,8 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
 if (get_bits_left(gb) < 0) {
 av_log(s->avctx, AV_LOG_ERROR,
"Overread VPS by %d bits\n", -get_bits_left(gb));
-goto err;
+if (s->vps_list[vps_id])
+goto err;
 }
 
 if (s->vps_list[vps_id] &&

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

[FFmpeg-cvslog] avformat/id3v2: detect PNG by header instead of mime

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Thu Jun 18 
18:37:39 2015 +0200| [622f1468c92cb399e824894aa456d5590da6cc56] | committer: 
Michael Niedermayer

avformat/id3v2: detect PNG by header instead of mime

the mimetype for PNG can be set to jpeg

Fixes 01\ -\ Cider\ Time.mp3

Signed-off-by: Michael Niedermayer 

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

 libavformat/id3v2.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 2289bfc..52d8531 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -1083,6 +1083,9 @@ int ff_id3v2_parse_apic(AVFormatContext *s, 
ID3v2ExtraMeta **extra_meta)
 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
 st->codec->codec_id   = apic->id;
 
+if (AV_RB64(apic->buf->data) == 0x89504e470d0a1a0a)
+st->codec->codec_id = AV_CODEC_ID_PNG;
+
 if (apic->description[0])
 av_dict_set(&st->metadata, "title", apic->description, 0);
 

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

[FFmpeg-cvslog] id3v2: strip trailing spaces from APIC tag

[wm4]

ffmpeg | branch: master | wm4  | Thu May  7 23:56:37 
2015 +0200| [d4007d176313f6fe08c4fd2e484495f55e280c2a] | committer: Michael 
Niedermayer

id3v2: strip trailing spaces from APIC tag

The APIC description must be unique, and some ID3v2 tag writers add
spaces to write several APIC entries with the same description. The
trailing spaces simply serve as a way to disambiguate the description.
Do this so that API users do not have to special-case mp3 to fix this
cosmetic issue.

Requested-by: wm4
Signed-off-by: Michael Niedermayer 

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

 libavformat/id3v2.c |   11 +++
 1 file changed, 11 insertions(+)

diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index 52d8531..6eec60e 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -535,6 +535,13 @@ static void free_apic(void *obj)
 av_freep(&apic);
 }
 
+static void rstrip_spaces(char *buf)
+{
+size_t len = strlen(buf);
+while (len > 0 && buf[len - 1] == ' ')
+buf[--len] = 0;
+}
+
 static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen,
   const char *tag, ID3v2ExtraMeta **extra_meta,
   int isv34)
@@ -608,6 +615,10 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, 
int taglen,
 new_extra->next = *extra_meta;
 *extra_meta = new_extra;
 
+// The description must be unique, and some ID3v2 tag writers add spaces
+// to write several APIC entries with the same description.
+rstrip_spaces(apic->description);
+
 return;
 
 fail:

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

[FFmpeg-cvslog] Tag n2.2.16 : FFmpeg 2.2.16 release

[git]

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

Tagger: Michael Niedermayer 
Date:   Thu Jun 18 21:09:38 2015 +0200

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

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 9c08619 web/download: Add FFmpeg 2.2.16

[ffmpeg-cvslog]

The branch, master has been updated
   via  9c08619fa7f947345bd7389e803c4bede10b270a (commit)
  from  b67a849c9ee2c9953d993c7f71ea6f1492c306c3 (commit)


- Log -
commit 9c08619fa7f947345bd7389e803c4bede10b270a
Author: Michael Niedermayer 
AuthorDate: Thu Jun 18 21:20:53 2015 +0200
Commit: Michael Niedermayer 
CommitDate: Thu Jun 18 21:20:53 2015 +0200

web/download: Add FFmpeg 2.2.16

diff --git a/src/download b/src/download
index 6c504cf..7884f63 100644
--- a/src/download
+++ b/src/download
@@ -417,13 +417,13 @@ libpostproc53.  0.100

 
   
-FFmpeg 2.2.15 "Muybridge"
+FFmpeg 2.2.16 "Muybridge"
 
   
-2.2.15 was released on 2015-04-17. It is the latest stable FFmpeg release
+2.2.16 was released on 2015-06-18. It is the latest stable FFmpeg release
 from the 2.2 release branch, which was cut from master on 2014-03-01.
 Amongst lots of other changes, it includes all changes from
-ffmpeg-mt, libav master of 2014-03-01, libav 10.6 as of 2015-03-14.
+ffmpeg-mt, libav master of 2014-03-01, libav 10.7 as of 2015-06-18.
   
   It includes the following library versions:
   
@@ -440,15 +440,15 @@ libpostproc52.  3.100
 
   
 
-  Download bzip2 tarball
-  PGP 
signature
+  Download bzip2 tarball
+  PGP 
signature
  
 
-  Download 
gzip tarball
-  PGP 
signature
+  Download 
gzip tarball
+  PGP 
signature
  
 
-  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.2.15";>Changelog
+  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.2.16";>Changelog
  

 

---

Summary of changes:
 src/download | 16 
 1 file 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] avformat/singlejpeg: fix standalone compilation

[James Almer]

ffmpeg | branch: release/2.7 | James Almer  | Sat Jun 13 
17:47:13 2015 -0300| [3b6aeb148b1da3b21a5a569f2697c7e49901d031] | committer: 
James Almer

avformat/singlejpeg: fix standalone compilation

(cherry picked from commit 4aebaed0e17b396bd9d18acb8e58a4700c7559df)

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

 libavformat/rawenc.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index e95cb61..e59f1ae 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -250,7 +250,9 @@ AVOutputFormat ff_mjpeg_muxer = {
 .write_packet  = ff_raw_write_packet,
 .flags = AVFMT_NOTIMESTAMPS,
 };
+#endif
 
+#if CONFIG_SINGLEJPEG_MUXER
 AVOutputFormat ff_singlejpeg_muxer = {
 .name  = "singlejpeg",
 .long_name = NULL_IF_CONFIG_SMALL("JPEG single image"),

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

[FFmpeg-cvslog] ffmpeg: Free last_frame instead of just unref

[Michael Niedermayer]

ffmpeg | branch: release/2.7 | Michael Niedermayer  | Thu Jun 
18 05:27:08 2015 +0200| [e04ae11fa06a6b156f077b91f4d7de9014c82006] | committer: 
Michael Niedermayer

ffmpeg: Free last_frame instead of just unref

Fixes Ticket4611

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

Signed-off-by: Michael Niedermayer 

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

 ffmpeg.c |2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 40d929d..f502998 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1178,6 +1178,8 @@ static void do_video_out(AVFormatContext *s,
 av_frame_unref(ost->last_frame);
 if (next_picture)
 av_frame_ref(ost->last_frame, next_picture);
+else
+av_frame_free(&ost->last_frame);
 }
 
 static double psnr(double d)

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

[FFmpeg-cvslog] tls_gnutls: fix hang on disconnection

[wm4]

ffmpeg | branch: release/2.7 | wm4  | Sat Jun 13 
23:55:21 2015 +0200| [c3c8365dbd3b677207998e5120f7b78850e3532c] | committer: 
Michael Niedermayer

tls_gnutls: fix hang on disconnection

GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index 942ece9..6388f37 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -87,7 +87,7 @@ static int tls_close(URLContext *h)
 {
 TLSContext *c = h->priv_data;
 if (c->need_shutdown)
-gnutls_bye(c->session, GNUTLS_SHUT_RDWR);
+gnutls_bye(c->session, GNUTLS_SHUT_WR);
 if (c->session)
 gnutls_deinit(c->session);
 if (c->cred)

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

[FFmpeg-cvslog] configure: only disable VSX for !ppc64el

[Andreas Cadhalpun]

ffmpeg | branch: release/2.7 | Andreas Cadhalpun 
 | Sat Jun 13 13:09:21 2015 +0200| 
[ed5041143edb9742860250de9bddc384dbd827cf] | committer: Michael Niedermayer

configure: only disable VSX for !ppc64el

This reverts commit 04f0002, which made it impossible to enable VSX with
a generic cpu.

This changes the behavior back to what it was before commit b0af404.

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

Signed-off-by: Michael Niedermayer 

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

 configure |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 0c907ff..06a9941 100755
--- a/configure
+++ b/configure
@@ -4033,9 +4033,6 @@ elif enabled ppc; then
 disable altivec
 disable dcbzl
 ;;
-*)
-disable vsx
-;;
 esac
 
 elif enabled sparc; then
@@ -4610,6 +4607,9 @@ unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 
'E';
 EOF
 od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
 
+if ! enabled ppc64 || enabled bigendian; then
+disable vsx
+fi
 
 check_gas() {
 log "check_gas using '$as' as AS"

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

[FFmpeg-cvslog] avcodec/hevc_ps: Only discard overread VPS if a previous is available

[Michael Niedermayer]

ffmpeg | branch: release/2.7 | Michael Niedermayer  | Thu Jun 
18 18:03:21 2015 +0200| [6432f8826dd15ec9ce966249f4dc6933f94cf04f] | committer: 
Michael Niedermayer

avcodec/hevc_ps: Only discard overread VPS if a previous is available

Fixes Ticket4621

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index ced0600..757f666 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -499,7 +499,8 @@ int ff_hevc_decode_nal_vps(HEVCContext *s)
 if (get_bits_left(gb) < 0) {
 av_log(s->avctx, AV_LOG_ERROR,
"Overread VPS by %d bits\n", -get_bits_left(gb));
-goto err;
+if (s->vps_list[vps_id])
+goto err;
 }
 
 if (s->vps_list[vps_id] &&

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

[FFmpeg-cvslog] avio: fix potential crashes when combining ffio_ensure_seekback + crc

[wm4]

ffmpeg | branch: release/2.7 | wm4  | Wed Jun 17 
00:21:02 2015 +0200| [9473e5a05d2cbdd56a7e3923868451a07a0edfe0] | committer: 
Michael Niedermayer

avio: fix potential crashes when combining ffio_ensure_seekback + crc

Calling ffio_ensure_seekback() if ffio_init_checksum() has been called
on the same context can lead to out of bounds memory accesses and
crashes. The reason is that ffio_ensure_seekback() does not update
checksum_ptr after reallocating the buffer, resulting in a dangling
pointer.

This effectively fixes potential crashes when opening mp3 files.

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

Signed-off-by: Michael Niedermayer 

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

 libavformat/aviobuf.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 45400cd..392b369 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -812,6 +812,7 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
 int max_buffer_size = s->max_packet_size ?
   s->max_packet_size : IO_BUFFER_SIZE;
 int filled = s->buf_end - s->buffer;
+ptrdiff_t checksum_ptr_offset = s->checksum_ptr ? s->checksum_ptr - 
s->buffer : -1;
 
 buf_size += s->buf_ptr - s->buffer + max_buffer_size;
 
@@ -829,6 +830,8 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
 s->buf_end = buffer + (s->buf_end - s->buffer);
 s->buffer = buffer;
 s->buffer_size = buf_size;
+if (checksum_ptr_offset >= 0)
+s->checksum_ptr = s->buffer + checksum_ptr_offset;
 return 0;
 }
 

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

[FFmpeg-cvslog] avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set

[Michael Niedermayer]

ffmpeg | branch: release/2.7 | Michael Niedermayer  | Thu Jun 
18 00:34:59 2015 +0200| [08fadda68aebdc0b28c6e2816b77875ee50d6faf] | committer: 
Michael Niedermayer

avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set

Fixes Ticket4636

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index af727a5..45ab3a3 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -753,7 +753,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
 s->chroma_planes = desc->nb_components < 3 ? 0 : 1;
 s->colorspace = 0;
 s->transparency = desc->nb_components == 4;
-if (!avctx->bits_per_raw_sample)
+if (!avctx->bits_per_raw_sample && !s->bits_per_raw_sample)
 s->bits_per_raw_sample = 8;
 break;
 case AV_PIX_FMT_RGB32:

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

[FFmpeg-cvslog] doc: fix spelling errors

[Andreas Cadhalpun]

ffmpeg | branch: release/2.7 | Andreas Cadhalpun 
 | Sat Jun 13 21:34:40 2015 +0200| 
[265db4154097a754107dcc7dcd8e13a8bd755db1] | committer: Michael Niedermayer

doc: fix spelling errors

Neccessary -> Necessary
formated   -> formatted
thee   -> the
eventhough -> even though
seperately -> separately

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

Signed-off-by: Michael Niedermayer 

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

 doc/examples/transcoding.c |2 +-
 libavcodec/ass_split.h |2 +-
 libavcodec/bitstream.c |2 +-
 libavformat/avio.h |2 +-
 libavformat/flvenc.c   |2 +-
 libavutil/log.h|2 +-
 libavutil/pixfmt.h |2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/examples/transcoding.c b/doc/examples/transcoding.c
index 2a8220e..980e1f1 100644
--- a/doc/examples/transcoding.c
+++ b/doc/examples/transcoding.c
@@ -117,7 +117,7 @@ static int open_output_file(const char *filename)
 /* in this example, we choose transcoding to same codec */
 encoder = avcodec_find_encoder(dec_ctx->codec_id);
 if (!encoder) {
-av_log(NULL, AV_LOG_FATAL, "Neccessary encoder not found\n");
+av_log(NULL, AV_LOG_FATAL, "Necessary encoder not found\n");
 return AVERROR_INVALIDDATA;
 }
 
diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h
index c912252..defb5cc 100644
--- a/libavcodec/ass_split.h
+++ b/libavcodec/ass_split.h
@@ -103,7 +103,7 @@ typedef struct ASSSplitContext ASSSplitContext;
  * Split a full ASS file or a ASS header from a string buffer and store
  * the split structure in a newly allocated context.
  *
- * @param buf String containing the ASS formated data.
+ * @param buf String containing the ASS formatted data.
  * @return Newly allocated struct containing split data.
  */
 ASSSplitContext *ff_ass_split(const char *buf);
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 20eae6b..0074234 100644
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -247,7 +247,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int 
nb_codes,
 
 /* Build VLC decoding tables suitable for use with get_vlc().
 
-   'nb_bits' set thee decoding table size (2^nb_bits) entries. The
+   'nb_bits' set the decoding table size (2^nb_bits) entries. The
bigger it is, the faster is the decoding. But it should not be too
big to save memory and L1 cache. '9' is a good compromise.
 
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 5c5aa6d..0730593 100644
--- a/libavformat/avio.h
+++ b/libavformat/avio.h
@@ -79,7 +79,7 @@ typedef struct AVIODirEntry {
 char *name;   /**< Filename */
 int type; /**< Type of the entry */
 int utf8; /**< Set to 1 when name is encoded 
with UTF-8, 0 otherwise.
-   Name can be encoded with UTF-8 
eventhough 0 is set. */
+   Name can be encoded with UTF-8 
even though 0 is set. */
 int64_t size; /**< File size in bytes, -1 if 
unknown. */
 int64_t modification_timestamp;   /**< Time of last modification in 
microseconds since unix
epoch, -1 if unknown. */
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index e4717ca..e217ba8 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -562,7 +562,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket 
*pkt)
 }
 
 if (enc->codec_id == AV_CODEC_ID_H264 || enc->codec_id == 
AV_CODEC_ID_MPEG4) {
-/* check if extradata looks like mp4 formated */
+/* check if extradata looks like mp4 formatted */
 if (enc->extradata_size > 0 && *(uint8_t*)enc->extradata != 1)
 if ((ret = ff_avc_parse_nal_units_buf(pkt->data, &data, &size)) < 
0)
 return ret;
diff --git a/libavutil/log.h b/libavutil/log.h
index 57769b8..db7eb3f 100644
--- a/libavutil/log.h
+++ b/libavutil/log.h
@@ -309,7 +309,7 @@ AVClassCategory av_default_get_category(void *ptr);
 
 /**
  * Format a line of log the same way as the default callback.
- * @param line  buffer to receive the formated line
+ * @param line  buffer to receive the formatted line
  * @param line_size size of the buffer
  * @param print_prefix  used to store whether the prefix must be printed;
  *  must point to a persistent integer initially set to 1
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h
index 58e3544..eef6444 100644
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@@ -530,7 +530,7 @@ enum AVColorRange {
  * Illustration showing the location of the first (top left) chro

[FFmpeg-cvslog] examples/demuxing_decoding: use properties from frame instead of video_dec_ctx

[Andreas Cadhalpun]

ffmpeg | branch: release/2.7 | Andreas Cadhalpun 
 | Sun Jun 14 20:34:16 2015 +0200| 
[8a24ccfee3841d5b2069371b78921e7e6c8289dc] | committer: Michael Niedermayer

examples/demuxing_decoding: use properties from frame instead of video_dec_ctx

This is more robust.

And only check if there is actually a frame returned.

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

Signed-off-by: Michael Niedermayer 

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

 doc/examples/demuxing_decoding.c |   30 --
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/doc/examples/demuxing_decoding.c b/doc/examples/demuxing_decoding.c
index feeeb96..98b3a83 100644
--- a/doc/examples/demuxing_decoding.c
+++ b/doc/examples/demuxing_decoding.c
@@ -81,22 +81,24 @@ static int decode_packet(int *got_frame, int cached)
 fprintf(stderr, "Error decoding video frame (%s)\n", 
av_err2str(ret));
 return ret;
 }
-if (video_dec_ctx->width != width || video_dec_ctx->height != height ||
-video_dec_ctx->pix_fmt != pix_fmt) {
-/* To handle this change, one could call av_image_alloc again and
- * decode the following frames into another rawvideo file. */
-fprintf(stderr, "Error: Width, height and pixel format have to be "
-"constant in a rawvideo file, but the width, height or "
-"pixel format of the input video changed:\n"
-"old: width = %d, height = %d, format = %s\n"
-"new: width = %d, height = %d, format = %s\n",
-width, height, av_get_pix_fmt_name(pix_fmt),
-video_dec_ctx->width, video_dec_ctx->height,
-av_get_pix_fmt_name(video_dec_ctx->pix_fmt));
-return -1;
-}
 
 if (*got_frame) {
+
+if (frame->width != width || frame->height != height ||
+frame->format != pix_fmt) {
+/* To handle this change, one could call av_image_alloc again 
and
+ * decode the following frames into another rawvideo file. */
+fprintf(stderr, "Error: Width, height and pixel format have to 
be "
+"constant in a rawvideo file, but the width, height or 
"
+"pixel format of the input video changed:\n"
+"old: width = %d, height = %d, format = %s\n"
+"new: width = %d, height = %d, format = %s\n",
+width, height, av_get_pix_fmt_name(pix_fmt),
+frame->width, frame->height,
+av_get_pix_fmt_name(frame->format));
+return -1;
+}
+
 printf("video_frame%s n:%d coded_n:%d pts:%s\n",
cached ? "(cached)" : "",
video_frame_count++, frame->coded_picture_number,

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

[FFmpeg-cvslog] ffmpeg_opt: Check for localtime() failure

[Michael Niedermayer]

ffmpeg | branch: release/2.7 | Michael Niedermayer  | Fri Jun 
12 15:36:20 2015 +0200| [965f96c5ed445c639377c977934ee3aecf505ca8] | committer: 
Michael Niedermayer

ffmpeg_opt: Check for localtime() failure

Found-by: Daemon404
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 8e91d9652ea5048d9014e7636e12c6ed4732d7b7)

Signed-off-by: Michael Niedermayer 

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

 ffmpeg_opt.c |3 +++
 1 file changed, 3 insertions(+)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 1c5794c..79cb5ca 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -2438,6 +2438,9 @@ static int opt_vstats(void *optctx, const char *opt, 
const char *arg)
 time_t today2 = time(NULL);
 struct tm *today = localtime(&today2);
 
+if (!today)
+return AVERROR(errno);
+
 snprintf(filename, sizeof(filename), "vstats_%02d%02d%02d.log", 
today->tm_hour, today->tm_min,
  today->tm_sec);
 return opt_vstats_file(NULL, opt, filename);

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

[FFmpeg-cvslog] h264: er: Copy from the previous reference only if compatible

[Andreas Cadhalpun]

ffmpeg | branch: release/2.7 | Andreas Cadhalpun 
 | Sun Jun 14 12:40:18 2015 +0200| 
[3ba55ea4aec2ce6c179017e12a933e20a20a14d1] | committer: Michael Niedermayer

h264: er: Copy from the previous reference only if compatible

Also use the frame pixel format instead of the one from the codec
context, which is more robust.

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

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 9c4d613..0712f2d 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1549,12 +1549,15 @@ int ff_h264_decode_slice_header(H264Context *h, 
H264SliceContext *sl)
  * vectors.  Given we are concealing a lost frame, this probably
  * is not noticeable by comparison, but it should be fixed. */
 if (h->short_ref_count) {
-if (prev) {
+if (prev &&
+h->short_ref[0]->f->width == prev->f->width &&
+h->short_ref[0]->f->height == prev->f->height &&
+h->short_ref[0]->f->format == prev->f->format) {
 av_image_copy(h->short_ref[0]->f->data,
   h->short_ref[0]->f->linesize,
   (const uint8_t **)prev->f->data,
   prev->f->linesize,
-  h->avctx->pix_fmt,
+  prev->f->format,
   h->mb_width  * 16,
   h->mb_height * 16);
 h->short_ref[0]->poc = prev->poc + 2;

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

[FFmpeg-cvslog] avformat: clarify what package needs to be compiled with SSL support

[wm4]

ffmpeg | branch: master | wm4  | Thu Jun 18 20:36:19 
2015 +0200| [f6c3f1ed6048ebc55f652ed59f7af9acebbf57e5] | committer: Michael 
Niedermayer

avformat: clarify what package needs to be compiled with SSL support

Try to reduce user confusion.

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/avio.c b/libavformat/avio.c
index deeb87f..261ff2a 100644
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -263,7 +263,7 @@ int ffurl_alloc(URLContext **puc, const char *filename, int 
flags,
 
 *puc = NULL;
 if (av_strstart(filename, "https:", NULL))
-av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile with 
"
+av_log(NULL, AV_LOG_WARNING, "https protocol not found, recompile 
FFmpeg with "
  "openssl, gnutls,\n"
  "or securetransport enabled.\n");
 return AVERROR_PROTOCOL_NOT_FOUND;

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

[FFmpeg-cvslog] vp9: don't retain NULL as segmentation_map

[Andreas Cadhalpun]

ffmpeg | branch: master | Andreas Cadhalpun  
| Wed Jun 17 19:02:15 2015 +0200| [d216b9debd9843d31732ebb7344a85b3cd96b7cc] | 
committer: Andreas Cadhalpun

vp9: don't retain NULL as segmentation_map

This fixes segmentation faults, which were introduced in commit
4ba8f327.

Reviewed-by: Ronald S. Bultje 
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 4e2ed53..9d9326c 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -3988,7 +3988,8 @@ static int vp9_decode_frame(AVCodecContext *ctx, void 
*frame,
 int size = pkt->size;
 VP9Context *s = ctx->priv_data;
 int res, tile_row, tile_col, i, ref, row, col;
-int retain_segmap_ref = s->segmentation.enabled && 
!s->segmentation.update_map;
+int retain_segmap_ref = s->segmentation.enabled && 
!s->segmentation.update_map
+&& s->frames[REF_FRAME_SEGMAP].segmentation_map;
 ptrdiff_t yoff, uvoff, ls_y, ls_uv;
 AVFrame *f;
 int bytesperpixel;

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

[FFmpeg-cvslog] postproc: fix unaligned access

[Andreas Cadhalpun]

ffmpeg | branch: master | Andreas Cadhalpun  
| Thu Jun 18 20:15:12 2015 +0200| [590743101dc934043f34013f1c9bb9fb261355b0] | 
committer: Andreas Cadhalpun

postproc: fix unaligned access

QP_store is only 8-bit-aligned, so accessing it as uint32_t causes
SIGBUS crashes on sparc.
The AV_RN32/AV_WN32 macros only do unaligned access in the
HAVE_FAST_UNALIGNED case.

Reviewed-by: Michael Niedermayer 
Signed-off-by: Andreas Cadhalpun 

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

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

diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 92cc436..3b86f93 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -76,6 +76,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x 
... checks
 #include "config.h"
 #include "libavutil/avutil.h"
 #include "libavutil/avassert.h"
+#include "libavutil/intreadwrite.h"
 #include 
 #include 
 #include 
@@ -997,7 +998,7 @@ void  pp_postprocess(const uint8_t * src[3], const int 
srcStride[3],
 int i;
 const int count= FFMAX(mbHeight * QPStride, mbWidth);
 for(i=0; i<(count>>2); i++){
-((uint32_t*)c->nonBQPTable)[i] = ((const 
uint32_t*)QP_store)[i] & 0x3F3F3F3F;
+AV_WN32(c->nonBQPTable + (i<<2), AV_RN32(QP_store + (i<<2)) & 
0x3F3F3F3F);
 }
 for(i<<=2; inonBQPTable[i] = QP_store[i] & 0x3F;

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

[FFmpeg-cvslog] avutil/aes: Fix types

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Fri Jun 19 
02:11:40 2015 +0200| [fdbad24090e167821c8587e4f26d0978fe4bef6b] | committer: 
Michael Niedermayer

avutil/aes: Fix types

Fixes "warning: argument #2 is incompatible with prototype:"

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavutil/aes.c b/libavutil/aes.c
index fd87060..8d4 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -311,8 +311,8 @@ int main(int argc, char **argv)
 AVAES ae, ad;
 AVLFG prng;
 
-av_aes_init(&ae, "PI=3.141592654..", 128, 0);
-av_aes_init(&ad, "PI=3.141592654..", 128, 1);
+av_aes_init(&ae, (const uint8_t*)"PI=3.141592654..", 128, 0);
+av_aes_init(&ad, (const uint8_t*)"PI=3.141592654..", 128, 1);
 av_lfg_init(&prng, 1);
 
 for (i = 0; i < 1; i++) {

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

[FFmpeg-cvslog] avutil/adler32: Fix data type in test code

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Fri Jun 19 
02:09:50 2015 +0200| [d8a227f2319ad639293803e67ecce5a8c6984aca] | committer: 
Michael Niedermayer

avutil/adler32: Fix data type in test code

Fixes "warning: argument #2 is incompatible with prototype:"

Signed-off-by: Michael Niedermayer 

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

 libavutil/adler32.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/adler32.c b/libavutil/adler32.c
index 579d022..64c8767 100644
--- a/libavutil/adler32.c
+++ b/libavutil/adler32.c
@@ -108,7 +108,7 @@ static volatile int checksum;
 int main(int argc, char **argv)
 {
 int i;
-char data[LEN];
+uint8_t data[LEN];
 
 av_log_set_level(AV_LOG_DEBUG);
 

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

[FFmpeg-cvslog] avutil/avstring: Fix undefined shift

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Fri Jun 19 
02:13:08 2015 +0200| [2c881c7d45bc10205912e069d1c25103884a2059] | committer: 
Michael Niedermayer

avutil/avstring: Fix undefined shift

Signed-off-by: Michael Niedermayer 

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

 libavutil/avstring.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/avstring.c b/libavutil/avstring.c
index f785816..b184442 100644
--- a/libavutil/avstring.c
+++ b/libavutil/avstring.c
@@ -408,7 +408,7 @@ int av_utf8_decode(int32_t *codep, const uint8_t **bufp, 
const uint8_t *buf_end,
 goto end;
 }
 
-if (code >= 1<<31) {
+if (code >= 1U<<31) {
 ret = AVERROR(EILSEQ);  /* out-of-range value */
 goto end;
 }

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

[FFmpeg-cvslog] avutil/crc: Fix type of p table so its content fits without overflwoing

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Fri Jun 19 
02:16:49 2015 +0200| [d1dce1c51728b35a31248be81915f2ce6fcbb807] | committer: 
Michael Niedermayer

avutil/crc: Fix type of p table so its content fits without overflwoing

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavutil/crc.c b/libavutil/crc.c
index d8b1c99..e432843 100644
--- a/libavutil/crc.c
+++ b/libavutil/crc.c
@@ -383,7 +383,8 @@ int main(void)
 {
 uint8_t buf[1999];
 int i;
-int p[6][3] = { { AV_CRC_32_IEEE_LE, 0xEDB88320, 0x3D5CDD04 },
+unsigned
+p[6][3] = { { AV_CRC_32_IEEE_LE, 0xEDB88320, 0x3D5CDD04 },
 { AV_CRC_32_IEEE   , 0x04C11DB7, 0xC0F5BAE0 },
 { AV_CRC_24_IEEE   , 0x864CFB  , 0xB704CE   },
 { AV_CRC_16_ANSI_LE, 0xA001, 0xBFD8 },

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

[FFmpeg-cvslog] avcodec/fft-test: fix type of cpuflags

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Fri Jun 19 
02:08:06 2015 +0200| [76cc8582fd6f9b122d144023186ef42c2f9a7ca6] | committer: 
Michael Niedermayer

avcodec/fft-test: fix type of cpuflags

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/fft-test.c b/libavcodec/fft-test.c
index 7c3eea4..d647fde 100644
--- a/libavcodec/fft-test.c
+++ b/libavcodec/fft-test.c
@@ -285,7 +285,7 @@ int main(int argc, char **argv)
 break;
 case 'c':
 {
-int cpuflags = av_get_cpu_flags();
+unsigned cpuflags = av_get_cpu_flags();
 
 if (av_parse_cpu_caps(&cpuflags, optarg) < 0)
 return 1;

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

[FFmpeg-cvslog] avcodec/j2kenc: YUV should not use the ICT

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer  | Fri Jun 19 
04:51:59 2015 +0200| [bb3703a4c30659d7ae7b41a94455ce810bbc102b] | committer: 
Michael Niedermayer

avcodec/j2kenc: YUV should not use the ICT

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
index 68905cc..6a5fd36 100644
--- a/libavcodec/j2kenc.c
+++ b/libavcodec/j2kenc.c
@@ -271,7 +271,7 @@ static int put_cod(Jpeg2000EncoderContext *s)
 bytestream_put_byte(&s->buf, 0); // progression level
 bytestream_put_be16(&s->buf, 1); // num of layers
 if(s->avctx->pix_fmt == AV_PIX_FMT_YUV444P){
-bytestream_put_byte(&s->buf, 2); // ICT
+bytestream_put_byte(&s->buf, 0); // unspecified
 }else{
 bytestream_put_byte(&s->buf, 0); // unspecified
 }

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

Re: [FFmpeg-cvslog] avcodec/j2kenc: YUV should not use the ICT

[Clément Bœsch]

On Fri, Jun 19, 2015 at 05:33:32AM +0200, Michael Niedermayer wrote:
> ffmpeg | branch: master | Michael Niedermayer  | Fri Jun 19 
> 04:51:59 2015 +0200| [bb3703a4c30659d7ae7b41a94455ce810bbc102b] | committer: 
> Michael Niedermayer
> 
> avcodec/j2kenc: YUV should not use the ICT
> 
> Signed-off-by: Michael Niedermayer 
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb3703a4c30659d7ae7b41a94455ce810bbc102b
> ---
> 
>  libavcodec/j2kenc.c |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c
> index 68905cc..6a5fd36 100644
> --- a/libavcodec/j2kenc.c
> +++ b/libavcodec/j2kenc.c
> @@ -271,7 +271,7 @@ static int put_cod(Jpeg2000EncoderContext *s)
>  bytestream_put_byte(&s->buf, 0); // progression level
>  bytestream_put_be16(&s->buf, 1); // num of layers
>  if(s->avctx->pix_fmt == AV_PIX_FMT_YUV444P){
> -bytestream_put_byte(&s->buf, 2); // ICT
> +bytestream_put_byte(&s->buf, 0); // unspecified
>  }else{
>  bytestream_put_byte(&s->buf, 0); // unspecified
>  }

Any reason to keep the if?

-- 
Clément B.


pgp64MVEsaLql.pgp
Description: PGP signature
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog