[FFmpeg-cvslog] mov: further expand the list of parsed metadata tags

2014-12-09 Thread Dave Rice 
ffmpeg | branch: master | Dave Rice  | Fri Nov 28 23:44:06 
2014 +| [3c01039e0bc7d269900e15551f8171c4328a0223] | committer: Vittorio 
Giovara

mov: further expand the list of parsed metadata tags

Signed-off-by: Vittorio Giovara 

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

 libavformat/mov.c |   18 ++
 1 file changed, 18 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 44e26fe..a64ff4f 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -311,20 +311,38 @@ static int mov_read_udta_string(MOVContext *c, 
AVIOContext *pb, MOVAtom atom)
 case MKTAG( 't','v','s','n'): key = "season_number";
 parse = mov_metadata_int8_bypass_padding; break;
 case MKTAG(0xa9,'A','R','T'): key = "artist";break;
+case MKTAG(0xa9,'P','R','D'): key = "producer";  break;
 case MKTAG(0xa9,'a','l','b'): key = "album"; break;
 case MKTAG(0xa9,'a','u','t'): key = "artist";break;
+case MKTAG(0xa9,'c','h','p'): key = "chapter";   break;
 case MKTAG(0xa9,'c','m','t'): key = "comment";   break;
+case MKTAG(0xa9,'c','o','m'): key = "composer";  break;
 case MKTAG(0xa9,'c','p','y'): key = "copyright"; break;
 case MKTAG(0xa9,'d','a','y'): key = "date";  break;
+case MKTAG(0xa9,'d','i','r'): key = "director";  break;
+case MKTAG(0xa9,'d','i','s'): key = "disclaimer"; break;
+case MKTAG(0xa9,'e','d','1'): key = "edit_date"; break;
 case MKTAG(0xa9,'e','n','c'): key = "encoder";   break;
+case MKTAG(0xa9,'f','m','t'): key = "original_format"; break;
 case MKTAG(0xa9,'g','e','n'): key = "genre"; break;
 case MKTAG(0xa9,'g','r','p'): key = "grouping";  break;
+case MKTAG(0xa9,'h','s','t'): key = "host_computer"; break;
 case MKTAG(0xa9,'i','n','f'): key = "comment";   break;
 case MKTAG(0xa9,'l','y','r'): key = "lyrics";break;
+case MKTAG(0xa9,'m','a','k'): key = "make";  break;
+case MKTAG(0xa9,'m','o','d'): key = "model"; break;
 case MKTAG(0xa9,'n','a','m'): key = "title"; break;
+case MKTAG(0xa9,'o','p','e'): key = "original_artist"; break;
+case MKTAG(0xa9,'p','r','d'): key = "producer";  break;
+case MKTAG(0xa9,'p','r','f'): key = "performers"; break;
+case MKTAG(0xa9,'r','e','q'): key = "playback_requirements"; break;
+case MKTAG(0xa9,'s','r','c'): key = "original_source"; break;
 case MKTAG(0xa9,'s','t','3'): key = "subtitle";  break;
 case MKTAG(0xa9,'s','w','r'): key = "encoder";   break;
 case MKTAG(0xa9,'t','o','o'): key = "encoder";   break;
+case MKTAG(0xa9,'t','r','k'): key = "track"; break;
+case MKTAG(0xa9,'u','r','l'): key = "URL";   break;
+case MKTAG(0xa9,'w','r','n'): key = "warning";   break;
 case MKTAG(0xa9,'w','r','t'): key = "composer";  break;
 case MKTAG(0xa9,'x','y','z'): key = "location";  break;
 }

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

[FFmpeg-cvslog] Merge commit '3c01039e0bc7d269900e15551f8171c4328a0223'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
11:48:27 2014 +0100| [99bf26fc6b17c05e9e1ec598a714c5efe1b978f6] | committer: 
Michael Niedermayer

Merge commit '3c01039e0bc7d269900e15551f8171c4328a0223'

* commit '3c01039e0bc7d269900e15551f8171c4328a0223':
  mov: further expand the list of parsed metadata tags

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] arm: Use .data.rel.ro for const data with relocations

2014-12-09 Thread Martin Storsjö 
ffmpeg | branch: master | Martin Storsjö  | Sun Nov 16 
12:51:54 2014 +0200| [f963f80399deb1a2b44c1bac3af7123e8a0c9e46] | committer: 
Martin Storsjö

arm: Use .data.rel.ro for const data with relocations

Signed-off-by: Martin Storsjö 

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

 configure   |3 +++
 libavcodec/arm/fft_fixed_neon.S |2 +-
 libavcodec/arm/fft_neon.S   |2 +-
 libavcodec/arm/fft_vfp.S|2 +-
 libavutil/arm/asm.S |6 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 9ac4a8e..ed8316f 100755
--- a/configure
+++ b/configure
@@ -1543,6 +1543,7 @@ HAVE_LIST="
 libdc1394_1
 libdc1394_2
 sdl
+section_data_rel_ro
 threads
 vdpau_x11
 xlib
@@ -3415,6 +3416,7 @@ case $target_os in
 ;;
 android)
 disable symver
+enable section_data_rel_ro
 SLIB_INSTALL_NAME='$(SLIBNAME)'
 SLIB_INSTALL_LINKS=
 # soname not set on purpose
@@ -3549,6 +3551,7 @@ case $target_os in
 ;;
 linux)
 enable dv1394
+enable section_data_rel_ro
 ;;
 irix*)
 target_os=irix
diff --git a/libavcodec/arm/fft_fixed_neon.S b/libavcodec/arm/fft_fixed_neon.S
index faddc00..c70a189 100644
--- a/libavcodec/arm/fft_fixed_neon.S
+++ b/libavcodec/arm/fft_fixed_neon.S
@@ -242,7 +242,7 @@ function ff_fft_fixed_calc_neon, export=1
 bx  r3
 endfunc
 
-const   fft_fixed_tab_neon
+const   fft_fixed_tab_neon, relocate=1
 .word fft4_neon
 .word fft8_neon
 .word fft16_neon
diff --git a/libavcodec/arm/fft_neon.S b/libavcodec/arm/fft_neon.S
index c4d8918..b161015 100644
--- a/libavcodec/arm/fft_neon.S
+++ b/libavcodec/arm/fft_neon.S
@@ -348,7 +348,7 @@ function ff_fft_permute_neon, export=1
 pop {r4,pc}
 endfunc
 
-const   fft_tab_neon
+const   fft_tab_neon, relocate=1
 .word fft4_neon
 .word fft8_neon
 .word fft16_neon
diff --git a/libavcodec/arm/fft_vfp.S b/libavcodec/arm/fft_vfp.S
index 9c7b54e..c2801fa 100644
--- a/libavcodec/arm/fft_vfp.S
+++ b/libavcodec/arm/fft_vfp.S
@@ -33,7 +33,7 @@ function ff_fft_calc_vfp, export=1
 movrel  a2, (fft_tab_vfp - 8)
 ldr pc, [a2, ip, lsl #2]
 endfunc
-const fft_tab_vfp
+const   fft_tab_vfp, relocate=1
 .word   fft4_vfp
 .word   fft8_vfp
 .word   X(ff_fft16_vfp) @ this one alone is exported
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S
index 93d74b6..8479304 100644
--- a/libavutil/arm/asm.S
+++ b/libavutil/arm/asm.S
@@ -89,12 +89,16 @@ FUNC.func   \name
 .endif
 .endm
 
-.macro  const   name, align=2
+.macro  const   name, align=2, relocate=0
 .macro endconst
 ELF .size   \name, . - \name
 .purgem endconst
 .endm
+.if HAVE_SECTION_DATA_REL_RO && \relocate
+.section.data.rel.ro
+.else
 .section.rodata
+.endif
 .align  \align
 \name:
 .endm

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

[FFmpeg-cvslog] Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
11:58:13 2014 +0100| [16e65419ed3e654a04091616bd81b8c96c79c268] | committer: 
Michael Niedermayer

Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
configure

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
12:08:24 2014 +0100| [92d47e2aa3912fc9018ef10fb6272b288401ee47] | committer: 
Michael Niedermayer

Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'

* commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793':
  aarch64: Use .data.rel.ro for const data with relocations

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] aarch64: Use .data.rel.ro for const data with relocations

2014-12-09 Thread Martin Storsjö 
ffmpeg | branch: master | Martin Storsjö  | Sun Nov 16 
12:52:21 2014 +0200| [780cd20b00a69e26bbfffbb8eec16fbe999ea793] | committer: 
Martin Storsjö

aarch64: Use .data.rel.ro for const data with relocations

This reverts commit c00365b46d464ce47716315c1801818d811bdb9a
in addition to using a different section.

Signed-off-by: Martin Storsjö 

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

 libavcodec/aarch64/fft_neon.S|   35 +-
 libavcodec/aarch64/opus_imdct_neon.S |   20 +--
 libavutil/aarch64/asm.S  |   10 --
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/libavcodec/aarch64/fft_neon.S b/libavcodec/aarch64/fft_neon.S
index ae9e1c6..e205e23 100644
--- a/libavcodec/aarch64/fft_neon.S
+++ b/libavcodec/aarch64/fft_neon.S
@@ -376,8 +376,7 @@ function ff_fft_calc_neon, export=1
 ld1 {v30.16b}, [x10]
 mov x7,  #-8
 movrel  x12, pmmp
-ldr x4,  [x3, x2, lsl #3]
-add x3,  x3,  x4
+ldr x3,  [x3, x2, lsl #3]
 movrel  x13, mppm
 movrel  x14, X(ff_cos_16)
 ld1 {v31.16b}, [x11]
@@ -416,22 +415,22 @@ function ff_fft_permute_neon, export=1
 ret
 endfunc
 
-const   fft_tab_neon
-.quad fft4_neon - fft_tab_neon
-.quad fft8_neon - fft_tab_neon
-.quad fft16_neon- fft_tab_neon
-.quad fft32_neon- fft_tab_neon
-.quad fft64_neon- fft_tab_neon
-.quad fft128_neon   - fft_tab_neon
-.quad fft256_neon   - fft_tab_neon
-.quad fft512_neon   - fft_tab_neon
-.quad fft1024_neon  - fft_tab_neon
-.quad fft2048_neon  - fft_tab_neon
-.quad fft4096_neon  - fft_tab_neon
-.quad fft8192_neon  - fft_tab_neon
-.quad fft16384_neon - fft_tab_neon
-.quad fft32768_neon - fft_tab_neon
-.quad fft65536_neon - fft_tab_neon
+const   fft_tab_neon, relocate=1
+.quad fft4_neon
+.quad fft8_neon
+.quad fft16_neon
+.quad fft32_neon
+.quad fft64_neon
+.quad fft128_neon
+.quad fft256_neon
+.quad fft512_neon
+.quad fft1024_neon
+.quad fft2048_neon
+.quad fft4096_neon
+.quad fft8192_neon
+.quad fft16384_neon
+.quad fft32768_neon
+.quad fft65536_neon
 endconst
 
 const   pmmp, align=4
diff --git a/libavcodec/aarch64/opus_imdct_neon.S 
b/libavcodec/aarch64/opus_imdct_neon.S
index c98931c..d99edf4 100644
--- a/libavcodec/aarch64/opus_imdct_neon.S
+++ b/libavcodec/aarch64/opus_imdct_neon.S
@@ -438,8 +438,8 @@ function fft_b15_calc_neon
 uzp1v12.4s, v4.4s,  v5.4s   // exp[11 - 14].re
 uzp2v13.4s, v4.4s,  v5.4s   // exp[11 - 14].im
 zip1v14.4s, v6.4s,  v7.4s   // exp[5,10].re/exp[5,10].im
-ldr x6,  [x5, x3, lsl #3]
-add x5,  x5,  x6
+add x5,  x5,  x3,  lsl #3
+ldr x5,  [x5]
 mov x10, x0
 blr x5
 ldp x20, x30, [sp]
@@ -451,14 +451,14 @@ function fft_b15_calc_neon
 ret
 endfunc
 
-const   fft_tab_neon
-.quad fft15_neon  - fft_tab_neon
-.quad fft30_neon  - fft_tab_neon
-.quad fft60_neon  - fft_tab_neon
-.quad fft120_neon - fft_tab_neon
-.quad fft240_neon - fft_tab_neon
-.quad fft480_neon - fft_tab_neon
-.quad fft960_neon - fft_tab_neon
+const   fft_tab_neon, relocate=1
+.quad fft15_neon
+.quad fft30_neon
+.quad fft60_neon
+.quad fft120_neon
+.quad fft240_neon
+.quad fft480_neon
+.quad fft960_neon
 endconst
 
 function ff_celt_imdct_half_neon, export=1
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index b766e67..6a7f506 100644
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -52,12 +52,18 @@ FUNC.func   \name
 .endif
 .endm
 
-.macro  const   name, align=2
+.macro  const   name, align=2, relocate=0
 .macro endconst
 ELF .size   \name, . - \name
 .purgem endconst
 .endm
-#ifndef __MACH__
+#if HAVE_SECTION_DATA_REL_RO
+.if \relocate
+.section.data.rel.ro
+.else
+.section.rodata
+.endif
+#elif !defined(__MACH__)
 .section.rodata
 #else
 .const_data

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

[FFmpeg-cvslog] avformat/wavenc: check return value of strftime()

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
16:10:55 2014 +0100| [308429e124b97337a768839c1d5091900e974e7e] | committer: 
Michael Niedermayer

avformat/wavenc: check return value of strftime()

Fixes CID1257006

Signed-off-by: Michael Niedermayer 

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

 libavformat/wavenc.c |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/libavformat/wavenc.c b/libavformat/wavenc.c
index bce4876..2345fc5 100644
--- a/libavformat/wavenc.c
+++ b/libavformat/wavenc.c
@@ -252,7 +252,7 @@ static void peak_write_frame(AVFormatContext *s)
 wav->peak_num_frames++;
 }
 
-static void peak_write_chunk(AVFormatContext *s)
+static int peak_write_chunk(AVFormatContext *s)
 {
 WAVMuxContext *wav = s->priv_data;
 AVIOContext *pb = s->pb;
@@ -272,8 +272,12 @@ static void peak_write_chunk(AVFormatContext *s)
 av_log(s, AV_LOG_INFO, "Writing local time and date to Peak Envelope 
Chunk\n");
 now0 = av_gettime();
 now_secs = now0 / 100;
-strftime(timestamp, sizeof(timestamp), "%Y:%m:%d:%H:%M:%S:", 
localtime_r(&now_secs, &tmpbuf));
-av_strlcatf(timestamp, sizeof(timestamp), "%03d", (int)((now0 / 1000) 
% 1000));
+if (strftime(timestamp, sizeof(timestamp), "%Y:%m:%d:%H:%M:%S:", 
localtime_r(&now_secs, &tmpbuf))) {
+av_strlcatf(timestamp, sizeof(timestamp), "%03d", (int)((now0 / 
1000) % 1000));
+} else {
+av_log(s, AV_LOG_ERROR, "Failed to write timestamp\n");
+return -1;
+}
 }
 
 avio_wl32(pb, 1);   /* version */
@@ -293,6 +297,8 @@ static void peak_write_chunk(AVFormatContext *s)
 
 if (!wav->data)
 wav->data = peak;
+
+return 0;
 }
 
 static int wav_write_header(AVFormatContext *s)
@@ -414,6 +420,7 @@ static int wav_write_trailer(AVFormatContext *s)
 int64_t file_size, data_size;
 int64_t number_of_samples = 0;
 int rf64 = 0;
+int ret = 0;
 
 avio_flush(pb);
 
@@ -424,7 +431,7 @@ static int wav_write_trailer(AVFormatContext *s)
 }
 
 if (wav->write_peak && wav->peak_output) {
-peak_write_chunk(s);
+ret = peak_write_chunk(s);
 avio_flush(pb);
 }
 
@@ -485,7 +492,7 @@ static int wav_write_trailer(AVFormatContext *s)
 if (wav->write_peak)
 peak_free_buffers(s);
 
-return 0;
+return ret;
 }
 
 #define OFFSET(x) offsetof(WAVMuxContext, x)

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

[FFmpeg-cvslog] avformat/utils: change assert to av_assert0()

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
17:57:35 2014 +0100| [20cb3fab3f15773bfed3a011d7384b2efbd2daa9] | committer: 
Michael Niedermayer

avformat/utils: change assert to av_assert0()

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1bd21a2..5a2a72d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1924,7 +1924,7 @@ int64_t ff_gen_search(AVFormatContext *s, int 
stream_index, int64_t target_ts,
 av_dlog(s,
 "pos_min=0x%"PRIx64" pos_max=0x%"PRIx64" dts_min=%s 
dts_max=%s\n",
 pos_min, pos_max, av_ts2str(ts_min), av_ts2str(ts_max));
-assert(pos_limit <= pos_max);
+av_assert0(pos_limit <= pos_max);
 
 if (no_change == 0) {
 int64_t approximate_keyframe_distance = pos_max - pos_limit;

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

[FFmpeg-cvslog] avformat/utils: replace impossible condition by av_assert0() in ff_gen_search()

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
17:53:30 2014 +0100| [041c6109da206cc8baf1f53b2e9a1c5c881f1641] | committer: 
Michael Niedermayer

avformat/utils: replace impossible condition by av_assert0() in ff_gen_search()

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3447b35..1bd21a2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1917,10 +1917,7 @@ int64_t ff_gen_search(AVFormatContext *s, int 
stream_index, int64_t target_ts,
 return pos_max;
 }
 
-if (ts_min > ts_max)
-return -1;
-else if (ts_min == ts_max)
-pos_limit = pos_min;
+av_assert0(ts_min < ts_max);
 
 no_change = 0;
 while (pos_min < pos_limit) {

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

[FFmpeg-cvslog] avformat/crypto: fix key vs iv typo

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
19:58:56 2014 +0100| [2d0117f816b92510546caf26414961ee6088f961] | committer: 
Michael Niedermayer

avformat/crypto: fix key vs iv typo

Fixes Ticket 4167

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index c1754b0..22529fb 100644
--- a/libavformat/crypto.c
+++ b/libavformat/crypto.c
@@ -122,7 +122,7 @@ static int crypto_open2(URLContext *h, const char *uri, int 
flags, AVDictionary
c->key, c->keylen, "decryption key")) < 0)
 goto err;
 if ((ret = set_aes_arg(c, &c->decrypt_iv, &c->decrypt_ivlen,
-   c->key, c->keylen, "decryption IV")) < 0)
+   c->iv, c->ivlen, "decryption IV")) < 0)
 goto err;
 }
 
@@ -132,7 +132,7 @@ static int crypto_open2(URLContext *h, const char *uri, int 
flags, AVDictionary
 if (ret < 0)
 goto err;
 if ((ret = set_aes_arg(c, &c->encrypt_iv, &c->encrypt_ivlen,
-   c->key, c->keylen, "encryption IV")) < 0)
+   c->iv, c->ivlen, "encryption IV")) < 0)
 goto err;
 }
 

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

[FFmpeg-cvslog] Tag n2.2.11 : FFmpeg 2.2.11 release

2014-12-09 Thread git 
[ffmpeg] [branch: refs/tags/n2.2.11]
Tag:3f053a0076e7b9cdd7b9b156f788acdd7262acdd
> http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=3f053a0076e7b9cdd7b9b156f788acdd7262acdd

Tagger: Michael Niedermayer 
Date:   Tue Dec  9 20:48:00 2014 +0100

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

[FFmpeg-cvslog] [ffmpeg-web] branch master updated. ed8c404 web/download: add 2.2.11

2014-12-09 Thread gitolite 
The branch, master has been updated
   via  ed8c404568118d2da738c5c13c2b01e666fb738a (commit)
  from  8704d1247627a085cc7cd339a5a19e1cbc16e06c (commit)


- Log -
commit ed8c404568118d2da738c5c13c2b01e666fb738a
Author: Michael Niedermayer 
AuthorDate: Tue Dec 9 20:51:03 2014 +0100
Commit: Michael Niedermayer 
CommitDate: Tue Dec 9 20:51:03 2014 +0100

web/download: add 2.2.11

Signed-off-by: Michael Niedermayer 

diff --git a/src/download b/src/download
index 54caf1a..deb4cb4 100644
--- a/src/download
+++ b/src/download
@@ -351,13 +351,13 @@ libpostproc53.  0.100

 
   
-FFmpeg 2.2.10 "Muybridge"
+FFmpeg 2.2.11 "Muybridge"
 
   
-2.2.10 was released on 2014-11-01. It is the latest stable FFmpeg release
+2.2.11 was released on 2014-12-09. 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.5 as of 2014-09-20.
+ffmpeg-mt, libav master of 2014-03-01, libav 10.5 as of 2014-12-07.
   
   It includes the following library versions:
   
@@ -374,15 +374,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.10";>Changelog
+  http://git.videolan.org/?p=ffmpeg.git;a=shortlog;h=n2.2.11";>Changelog
  

 

---

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


hooks/post-receive
-- 

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

[FFmpeg-cvslog] libavformat: Build hevc.o when building the RTP muxer

2014-12-09 Thread Martin Storsjö 
ffmpeg | branch: master | Martin Storsjö  | Tue Dec  9 
12:13:54 2014 +0200| [fccfc22d1f304aef42a0b960e4c1d55ce67107f5] | committer: 
Martin Storsjö

libavformat: Build hevc.o when building the RTP muxer

The RTP muxer enables the actual codepaths within sdp.c,
which depend on hevc.o since e5cfc8fd.

This fixes builds with --disable-everything --enable-muxer=rtp.

Signed-off-by: Martin Storsjö 

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

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

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 15f205a..035eb72 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -299,7 +299,7 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \
 rtpenc_h264.o \
 rtpenc_vp8.o  \
 rtpenc_xiph.o \
-avc.o
+avc.o hevc.o
 OBJS-$(CONFIG_RTSP_DEMUXER)  += rtsp.o rtspdec.o httpauth.o \
 urldecode.o
 OBJS-$(CONFIG_RTSP_MUXER)+= rtsp.o rtspenc.o httpauth.o \

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

[FFmpeg-cvslog] Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Tue Dec  9 
21:04:49 2014 +0100| [6ef9d1b21629f005c319dfb2010154fa8e540f73] | committer: 
Michael Niedermayer

Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'

* commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5':
  libavformat: Build hevc.o when building the RTP muxer

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Allow mov musing if the ac3 parser was disabled.

2014-12-09 Thread Carl Eugen Hoyos 
ffmpeg | branch: master | Carl Eugen Hoyos  | Tue Dec  9 
21:12:54 2014 +0100| [01ab761b46c5b6021795f9e8bb8f8fa04843a3e0] | committer: 
Carl Eugen Hoyos

Allow mov musing if the ac3 parser was disabled.

This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de

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

 configure|2 +-
 libavformat/movenc.c |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 8006f3b..c510ee4 100755
--- a/configure
+++ b/configure
@@ -2435,7 +2435,7 @@ matroska_muxer_select="riffenc"
 mmf_muxer_select="riffenc"
 mov_demuxer_select="riffdec"
 mov_demuxer_suggest="zlib"
-mov_muxer_select="riffenc rtpenc_chain ac3_parser"
+mov_muxer_select="riffenc rtpenc_chain"
 mp3_demuxer_select="mpegaudio_parser"
 mp4_muxer_select="mov_muxer"
 mpegts_muxer_select="adts_muxer latm_muxer"
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 2321748..9445417 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4009,7 +4009,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
 } else {
 size = ff_hevc_annexb2mp4(pb, pkt->data, pkt->size, 0, NULL);
 }
-} else if (enc->codec_id == AV_CODEC_ID_EAC3) {
+} else if (CONFIG_AC3_PARSER && enc->codec_id == AV_CODEC_ID_EAC3) {
 size = handle_eac3(mov, pkt, trk);
 if (size < 0)
 return size;

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

[FFmpeg-cvslog] Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Dec 10 
00:38:52 2014 +0100| [824932dc473255745218c84033a4bc57ebe48576] | committer: 
Michael Niedermayer

Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'

* commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position 
independent

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

2014-12-09 Thread Janne Grunau 
ffmpeg | branch: master | Janne Grunau  | Mon Dec  8 
13:25:55 2014 +0100| [581c7f0e12b1fa39f73d683e54d6ecda0772c5a9] | committer: 
Janne Grunau

arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position 
independent

No significant difference in used cpu cycles on a cortex-a9.

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

 libavcodec/arm/mlpdsp_armv5te.S |   23 +--
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
index cf7d367..fecbe29 100644
--- a/libavcodec/arm/mlpdsp_armv5te.S
+++ b/libavcodec/arm/mlpdsp_armv5te.S
@@ -338,22 +338,23 @@ T   orr AC0, AC0, AC1
 .endm
 
 .macro switch_on_fir_taps  mask_minus1, shift_0, shift_8, iir_taps
-A   ldr pc, [pc, a3, lsl #2] // firorder is in range 0-(8-iir_taps)
+A   ldr CO0, [pc, a3, lsl #2]   // firorder is in range 0-(8-iir_taps)
+A   add pc,  pc,  CO0
 T   tbh [pc, a3, lsl #1]
 0:
-A   .word   0, 70f, 71f, 72f, 73f, 74f
+A   .word   (70f - 0b) - 4, (71f - 0b) - 4, (72f - 0b) - 4, (73f - 0b) - 
4, (74f - 0b) - 4
 T   .hword  (70f - 0b) / 2, (71f - 0b) / 2, (72f - 0b) / 2, (73f - 0b) / 
2, (74f - 0b) / 2
  .if \iir_taps <= 3
-A   .word   75f
+A   .word   (75f - 0b) - 4
 T   .hword  (75f - 0b) / 2
   .if \iir_taps <= 2
-A   .word   76f
+A   .word   (76f - 0b) - 4
 T   .hword  (76f - 0b) / 2
.if \iir_taps <= 1
-A   .word   77f
+A   .word   (77f - 0b) - 4
 T   .hword  (77f - 0b) / 2
 .if \iir_taps == 0
-A   .word   78f
+A   .word   (78f - 0b) - 4
 T   .hword  (78f - 0b) / 2
 .endif
.endif
@@ -379,10 +380,11 @@ T   .hword  (78f - 0b) / 2
 .endm
 
 .macro switch_on_iir_taps  mask_minus1, shift_0, shift_8
-A   ldr pc, [pc, a4, lsl #2] // irorder is in range 0-4
+A   ldr CO0, [pc, a4, lsl #2]   // irorder is in range 0-4
+A   add pc,  pc,  CO0
 T   tbh [pc, a4, lsl #1]
 0:
-A   .word   0, 60f, 61f, 62f, 63f, 64f
+A   .word   (60f - 0b) - 4, (61f - 0b) - 4, (62f - 0b) - 4, (63f - 0b) - 
4, (64f - 0b) - 4
 T   .hword  (60f - 0b) / 2, (61f - 0b) / 2, (62f - 0b) / 2, (63f - 0b) / 
2, (64f - 0b) / 2
 60: switch_on_fir_taps  \mask_minus1, \shift_0, \shift_8, 0
 61: switch_on_fir_taps  \mask_minus1, \shift_0, \shift_8, 1
@@ -604,10 +606,11 @@ function ff_mlp_rematrix_channel_arm, export=1
 cmp v5, #1
 beq 11f
 blo 10f
-A   ldr pc, [pc, v5, lsl #2]
+A   ldr v5,  [pc,  v5,  lsl #2]
+A   add pc,  pc,  v5
 T   tbh [pc, v5, lsl #1]
 0:
-A   .word   0, 0, 0, 12f, 13f, 14f, 15f, 16f, 17f, 18f, 19f, 20f, 21f, 
22f, 23f, 24f, 25f
+A   .word   0, 0, (12f - 0b) - 4, (13f - 0b) - 4, (14f - 0b) - 4, (15f - 
0b) - 4, (16f - 0b) - 4, (17f - 0b) - 4, (18f - 0b) - 4, (19f - 0b) - 4, (20f - 
0b) - 4, (21f - 0b) - 4, (22f - 0b) - 4, (23f - 0b) - 4, (24f - 0b) - 4, (25f - 
0b) - 4
 T   .hword  0, 0, (12f - 0b) / 2, (13f - 0b) / 2, (14f - 0b) / 2, (15f - 
0b) / 2
 T   .hword  (16f - 0b) / 2, (17f - 0b) / 2, (18f - 0b) / 2, (19f - 0b) / 2
 T   .hword  (20f - 0b) / 2, (21f - 0b) / 2, (22f - 0b) / 2, (23f - 0b) / 
2, (24f - 0b) / 2, (25f - 0b) / 2

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

[FFmpeg-cvslog] arm: mlpdsp: handle pic offset calculation in a macro

2014-12-09 Thread Janne Grunau 
ffmpeg | branch: master | Janne Grunau  | Mon Dec  8 
14:10:18 2014 +0100| [4c81613df499ba81d64ea102b38d0c6686cc304c] | committer: 
Janne Grunau

arm: mlpdsp: handle pic offset calculation in a macro

Makes the code easier to read since it hides different offset
calculations for arm and thumb mode.

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

 libavcodec/arm/mlpdsp_armv5te.S |   36 
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
index fecbe29..4272dae 100644
--- a/libavcodec/arm/mlpdsp_armv5te.S
+++ b/libavcodec/arm/mlpdsp_armv5te.S
@@ -43,6 +43,14 @@ I   .reqip
 PSAMP   .reqlr
 
 
+.macro branch_pic_label first, remainder:vararg
+A   .word   \first   - 4
+T   .hword  (\first) / 2
+.ifnb   \remainder
+branch_pic_label \remainder
+.endif
+.endm
+
 // Some macros that do loads/multiplies where the register number is determined
 // from an assembly-time expression. Boy is GNU assembler's syntax ugly...
 
@@ -342,20 +350,16 @@ A   ldr CO0, [pc, a3, lsl #2]   // firorder is in 
range 0-(8-iir_taps)
 A   add pc,  pc,  CO0
 T   tbh [pc, a3, lsl #1]
 0:
-A   .word   (70f - 0b) - 4, (71f - 0b) - 4, (72f - 0b) - 4, (73f - 0b) - 
4, (74f - 0b) - 4
-T   .hword  (70f - 0b) / 2, (71f - 0b) / 2, (72f - 0b) / 2, (73f - 0b) / 
2, (74f - 0b) / 2
+branch_pic_label (70f - 0b), (71f - 0b), (72f - 0b), (73f - 0b)
+branch_pic_label (74f - 0b)
  .if \iir_taps <= 3
-A   .word   (75f - 0b) - 4
-T   .hword  (75f - 0b) / 2
+branch_pic_label (75f - 0b)
   .if \iir_taps <= 2
-A   .word   (76f - 0b) - 4
-T   .hword  (76f - 0b) / 2
+branch_pic_label (76f - 0b)
.if \iir_taps <= 1
-A   .word   (77f - 0b) - 4
-T   .hword  (77f - 0b) / 2
+branch_pic_label (77f - 0b)
 .if \iir_taps == 0
-A   .word   (78f - 0b) - 4
-T   .hword  (78f - 0b) / 2
+branch_pic_label (78f - 0b)
 .endif
.endif
   .endif
@@ -384,8 +388,8 @@ A   ldr CO0, [pc, a4, lsl #2]   // irorder is in 
range 0-4
 A   add pc,  pc,  CO0
 T   tbh [pc, a4, lsl #1]
 0:
-A   .word   (60f - 0b) - 4, (61f - 0b) - 4, (62f - 0b) - 4, (63f - 0b) - 
4, (64f - 0b) - 4
-T   .hword  (60f - 0b) / 2, (61f - 0b) / 2, (62f - 0b) / 2, (63f - 0b) / 
2, (64f - 0b) / 2
+branch_pic_label (60f - 0b), (61f - 0b), (62f - 0b), (63f - 0b)
+branch_pic_label (64f - 0b)
 60: switch_on_fir_taps  \mask_minus1, \shift_0, \shift_8, 0
 61: switch_on_fir_taps  \mask_minus1, \shift_0, \shift_8, 1
 62: switch_on_fir_taps  \mask_minus1, \shift_0, \shift_8, 2
@@ -610,10 +614,10 @@ A   ldr v5,  [pc,  v5,  lsl #2]
 A   add pc,  pc,  v5
 T   tbh [pc, v5, lsl #1]
 0:
-A   .word   0, 0, (12f - 0b) - 4, (13f - 0b) - 4, (14f - 0b) - 4, (15f - 
0b) - 4, (16f - 0b) - 4, (17f - 0b) - 4, (18f - 0b) - 4, (19f - 0b) - 4, (20f - 
0b) - 4, (21f - 0b) - 4, (22f - 0b) - 4, (23f - 0b) - 4, (24f - 0b) - 4, (25f - 
0b) - 4
-T   .hword  0, 0, (12f - 0b) / 2, (13f - 0b) / 2, (14f - 0b) / 2, (15f - 
0b) / 2
-T   .hword  (16f - 0b) / 2, (17f - 0b) / 2, (18f - 0b) / 2, (19f - 0b) / 2
-T   .hword  (20f - 0b) / 2, (21f - 0b) / 2, (22f - 0b) / 2, (23f - 0b) / 
2, (24f - 0b) / 2, (25f - 0b) / 2
+branch_pic_label  0,  0, (12f - 0b), (13f - 0b)
+branch_pic_label (14f - 0b), (15f - 0b), (16f - 0b), (17f - 0b)
+branch_pic_label (18f - 0b), (19f - 0b), (20f - 0b), (21f - 0b)
+branch_pic_label (22f - 0b), (23f - 0b), (24f - 0b), (25f - 0b)
 10: switch_on_au_size  0
 11: switch_on_au_size  1
 12: switch_on_au_size  2

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

[FFmpeg-cvslog] Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Dec 10 
00:51:15 2014 +0100| [cb416a7d795414aaa534c27943bda0d3aef3b5a1] | committer: 
Michael Niedermayer

Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

* commit '4c81613df499ba81d64ea102b38d0c6686cc304c':
  arm: mlpdsp: handle pic offset calculation in a macro

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Dec 10 
00:58:13 2014 +0100| [b7bfe17824b668bb5865024029cacaf083b2c1ce] | committer: 
Michael Niedermayer

Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'

* commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747':
  fate: add dolby true hd tests

Conflicts:
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] fate: add dolby true hd tests

2014-12-09 Thread Janne Grunau 
ffmpeg | branch: master | Janne Grunau  | Mon Dec  8 
16:21:43 2014 +0100| [d2f1d42b18787e4fcb28864d9d9f701dd64a5747] | committer: 
Janne Grunau

fate: add dolby true hd tests

The existing meridian audio test does not test
ff_mlp_rematrix_channel_arm. This sample (first 640k of
https://samples.libav.org/A-codecs/TrueHD/TrueHD.raw) uses
ff_mlp_rematrix_channel_arm. Since this sample has 5.1 channels it also
allows testing the integrated downmixing.

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

 tests/fate/lossless-audio.mak  |6 ++
 tests/ref/fate/lossless-truehd-5.1 |1 +
 tests/ref/fate/lossless-truehd-5.1-downmix-2.0 |1 +
 3 files changed, 8 insertions(+)

diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak
index 3638f17..751c721 100644
--- a/tests/fate/lossless-audio.mak
+++ b/tests/fate/lossless-audio.mak
@@ -15,6 +15,12 @@ fate-lossless-tak: CMD = md5 -i 
$(TARGET_SAMPLES)/lossless-audio/luckynight-part
 fate-lossless-tak: CMP = oneline
 fate-lossless-tak: REF = a28d4e5f2192057f7d4bece870f40bd0
 
+FATE_TRUEHD = fate-lossless-truehd-5.1 fate-lossless-truehd-5.1-downmix-2.0
+fate-lossless-truehd-5.1: CMD = md5 -f truehd -i 
$(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f s32le
+fate-lossless-truehd-5.1-downmix-2.0: CMD = md5 -f truehd 
-request_channel_layout 2 -i $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f 
s32le
+fate-lossless-truehd: $(FATE_TRUEHD)
+FATE_SAMPLES_AVCONV-$(call DEMDEC, TRUEHD, TRUEHD) += $(FATE_TRUEHD)
+
 FATE_SAMPLES_AVCONV-$(call DEMDEC, TTA, TTA) += fate-lossless-tta
 fate-lossless-tta: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/inside.tta
 
diff --git a/tests/ref/fate/lossless-truehd-5.1 
b/tests/ref/fate/lossless-truehd-5.1
new file mode 100644
index 000..373b917
--- /dev/null
+++ b/tests/ref/fate/lossless-truehd-5.1
@@ -0,0 +1 @@
+95d8aac39dd9f0d7fb83dc7b6f88df35
diff --git a/tests/ref/fate/lossless-truehd-5.1-downmix-2.0 
b/tests/ref/fate/lossless-truehd-5.1-downmix-2.0
new file mode 100644
index 000..f4afbc1
--- /dev/null
+++ b/tests/ref/fate/lossless-truehd-5.1-downmix-2.0
@@ -0,0 +1 @@
+a269aee0051d4400c9117136f08c9767

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

[FFmpeg-cvslog] rtpproto: Fix the input RTP data format check

2014-12-09 Thread Martin Storsjö 
ffmpeg | branch: master | Martin Storsjö  | Tue Dec  9 
16:05:14 2014 +0200| [95d880fa6436f3b557a9c060428a04b9e4d552df] | committer: 
Martin Storsjö

rtpproto: Fix the input RTP data format check

Only the upper 2 bits of the first byte are known to be
a fixed value.

The lower bits in the first byte of a RTP packet could be set
if the input is from another RTP packetizers than libavformat's,
but for RTCP packets, they would also be set when sending RTCP RR
packets, triggering false warnings about incorrect input format
to the protocol.

Signed-off-by: Martin Storsjö 

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

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

diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 1171fc2..5bff00e 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -411,7 +411,7 @@ static int rtp_write(URLContext *h, const uint8_t *buf, int 
size)
 if (size < 2)
 return AVERROR(EINVAL);
 
-if (buf[0] != (RTP_VERSION << 6))
+if ((buf[0] & 0xc0) != (RTP_VERSION << 6))
 av_log(h, AV_LOG_WARNING, "Data doesn't look like RTP packets, "
   "make sure the RTP muxer is used\n");
 

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

[FFmpeg-cvslog] Merge commit '95d880fa6436f3b557a9c060428a04b9e4d552df'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Dec 10 
01:16:31 2014 +0100| [bd378acad4e4865879bee0862c685e7f56ec91a9] | committer: 
Michael Niedermayer

Merge commit '95d880fa6436f3b557a9c060428a04b9e4d552df'

* commit '95d880fa6436f3b557a9c060428a04b9e4d552df':
  rtpproto: Fix the input RTP data format check

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Dec 10 
01:24:36 2014 +0100| [1397cb002d9d17f1f0abcfa98823678c172d32af] | committer: 
Michael Niedermayer

Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'

* commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb':
  dashenc: log file output progress in verbose mode

Merged-by: Michael Niedermayer 

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



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

[FFmpeg-cvslog] dashenc: log file output progress in verbose mode

2014-12-09 Thread Bryan Huh 
ffmpeg | branch: master | Bryan Huh  | Tue Dec  9 08:11:23 2014 
+| [fa8934d6d6a0bb290010bdf16265c40b331d56fb] | committer: Martin Storsjö

dashenc: log file output progress in verbose mode

As the manifest/segments are flushed to disk, log to stderr the
progress, when in verbose logging mode

Signed-off-by: Martin Storsjö 

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

 libavformat/dashenc.c |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index b3b1ac1..07dd673 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -634,6 +634,7 @@ static int dash_write_header(AVFormatContext *s)
 ffurl_close(os->out);
 os->out = NULL;
 }
+av_log(s, AV_LOG_VERBOSE, "Representation %d init segment written to: 
%s\n", i, filename);
 
 s->streams[i]->time_base = st->time_base;
 // If the muxer wants to shift timestamps, request to have them shifted
@@ -655,6 +656,8 @@ static int dash_write_header(AVFormatContext *s)
 ret = AVERROR(EINVAL);
 }
 ret = write_manifest(s, 0);
+if (!ret)
+av_log(s, AV_LOG_VERBOSE, "Manifest written to: %s\n", s->filename);
 
 fail:
 if (ret)
@@ -702,16 +705,13 @@ static void write_styp(AVIOContext *pb)
 ffio_wfourcc(pb, "msix");
 }
 
-static void find_index_range(AVFormatContext *s, const char *dirname,
- const char *filename, int64_t pos,
- int *index_length)
+static void find_index_range(AVFormatContext *s, const char *full_path,
+ int64_t pos, int *index_length)
 {
-char full_path[1024];
 uint8_t buf[8];
 URLContext *fd;
 int ret;
 
-snprintf(full_path, sizeof(full_path), "%s%s", dirname, filename);
 ret = ffurl_open(&fd, full_path, AVIO_FLAG_READ, &s->interrupt_callback, 
NULL);
 if (ret < 0)
 return;
@@ -765,14 +765,17 @@ static int dash_flush(AVFormatContext *s, int final, int 
stream)
 if (ret < 0)
 break;
 write_styp(os->ctx->pb);
+} else {
+snprintf(full_path, sizeof(full_path), "%s%s", c->dirname, 
os->initfile);
 }
+
 av_write_frame(os->ctx, NULL);
 avio_flush(os->ctx->pb);
 os->packets_written = 0;
 
 range_length = avio_tell(os->ctx->pb) - start_pos;
 if (c->single_file) {
-find_index_range(s, c->dirname, os->initfile, start_pos, 
&index_length);
+find_index_range(s, full_path, start_pos, &index_length);
 } else {
 ffurl_close(os->out);
 os->out = NULL;
@@ -781,6 +784,7 @@ static int dash_flush(AVFormatContext *s, int final, int 
stream)
 break;
 }
 add_segment(os, filename, os->start_dts, os->end_dts - os->start_dts, 
start_pos, range_length, index_length);
+av_log(s, AV_LOG_VERBOSE, "Representation %d media segment %d written 
to: %s\n", i, os->segment_index, full_path);
 }
 
 if (c->window_size || (final && c->remove_at_exit)) {

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

[FFmpeg-cvslog] avformat/avidec: Increase dshow_block_align use threshold by 1

2014-12-09 Thread Gabor Nagy 
ffmpeg | branch: master | Gabor Nagy  | Wed Dec 10 
02:59:25 2014 +0100| [ae8168074eb1c8230d9c6482102ca08a70a9c4b0] | committer: 
Michael Niedermayer

avformat/avidec: Increase dshow_block_align use threshold by 1

Fixes 00.avi

Signed-off-by: Michael Niedermayer 

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 78a6dea..e8c2730 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -126,7 +126,7 @@ static inline int get_duration(AVIStream *ast, int len)
 {
 if (ast->sample_size)
 return len;
-else if (ast->dshow_block_align)
+else if (ast->dshow_block_align > 1)
 return (len + ast->dshow_block_align - 1) / ast->dshow_block_align;
 else
 return 1;

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

[FFmpeg-cvslog] avcodec/x86/hevc_mc: remove dead branch from EPEL_FILTER

2014-12-09 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Wed Dec 10 
07:34:49 2014 +0100| [d43d5c5707532858b4f6a54525f1768464bcb3c2] | committer: 
Michael Niedermayer

avcodec/x86/hevc_mc: remove dead branch from EPEL_FILTER

Signed-off-by: Michael Niedermayer 

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

 libavcodec/x86/hevc_mc.asm |5 -
 1 file changed, 5 deletions(-)

diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm
index eaa070c..ca444e4 100644
--- a/libavcodec/x86/hevc_mc.asm
+++ b/libavcodec/x86/hevc_mc.asm
@@ -127,13 +127,8 @@ QPEL_TABLE 12, 4, w, sse4
 %endif
 sub  %2q, 1
 shl  %2q, 5  ; multiply by 32
-%if %0 == 2
-movdqa   m14, [rfilterq + %2q]; get 2 first values of 
filters
-movdqa   m15, [rfilterq + %2q+16] ; get 2 last values of 
filters
-%else
 movdqa   %3, [rfilterq + %2q]; get 2 first values of 
filters
 movdqa   %4, [rfilterq + %2q+16] ; get 2 last values of filters
-%endif
 %endmacro
 
 %macro EPEL_HV_FILTER 1

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