[libav-commits] g2meet: KR formatting cosmetics
Module: libav
Branch: master
Commit: a801453423420915425f902bf9f9cbe982a55d87
Author:Diego Biurrun di...@biurrun.de
Committer: Diego Biurrun di...@biurrun.de
Date: Fri Mar 7 15:15:02 2014 +0100
g2meet: KR formatting cosmetics
---
libavcodec/g2meet.c | 71 +--
1 file changed, 41 insertions(+), 30 deletions(-)
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 89fafef..6d773ba 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -198,8 +198,8 @@ static int jpg_decode_block(JPGContext *c, GetBitContext
*gb,
return AVERROR_INVALIDDATA;
if (dc)
dc = get_xbits(gb, dc);
-dc = dc * qmat[0] + c-prev_dc[plane];
-block[0] = dc;
+dc= dc * qmat[0] + c-prev_dc[plane];
+block[0] = dc;
c-prev_dc[plane] = dc;
pos = 0;
@@ -214,8 +214,8 @@ static int jpg_decode_block(JPGContext *c, GetBitContext
*gb,
if (val) {
int nbits = val;
-val = get_xbits(gb, nbits);
-val *= qmat[ff_zigzag_direct[pos]];
+val = get_xbits(gb, nbits);
+val*= qmat[ff_zigzag_direct[pos]];
block[c-scantable.permutated[pos]] = val;
}
}
@@ -359,7 +359,7 @@ static int kempf_decode_tile(G2MContext *c, int tile_x, int
tile_y,
width = FFMIN(c-width - tile_x * c-tile_width, c-tile_width);
height = FFMIN(c-height - tile_y * c-tile_height, c-tile_height);
-hdr = *src++;
+hdr = *src++;
sub_type = hdr 5;
if (sub_type == 0) {
int j;
@@ -379,19 +379,21 @@ static int kempf_decode_tile(G2MContext *c, int tile_x,
int tile_y,
src += 3;
}
npal = *src++ + 1;
-memcpy(pal, src, npal * 3); src += npal * 3;
+memcpy(pal, src, npal * 3);
+src += npal * 3;
if (sub_type != 2) {
for (i = 0; i npal; i++) {
if (!memcmp(pal + i * 3, transp, 3)) {
- tidx = i;
- break;
+tidx = i;
+break;
}
}
}
if (src_end - src 2)
return 0;
-zsize = (src[0] 8) | src[1]; src += 2;
+zsize = (src[0] 8) | src[1];
+src += 2;
if (src_end - src zsize)
return AVERROR_INVALIDDATA;
@@ -487,12 +489,12 @@ static int g2m_load_cursor(AVCodecContext *avctx,
G2MContext *c,
uint32_t cursor_hot_x, cursor_hot_y;
int cursor_fmt, err;
-cur_size = bytestream2_get_be32(gb);
-cursor_w = bytestream2_get_byte(gb);
-cursor_h = bytestream2_get_byte(gb);
-cursor_hot_x = bytestream2_get_byte(gb);
-cursor_hot_y = bytestream2_get_byte(gb);
-cursor_fmt= bytestream2_get_byte(gb);
+cur_size = bytestream2_get_be32(gb);
+cursor_w = bytestream2_get_byte(gb);
+cursor_h = bytestream2_get_byte(gb);
+cursor_hot_x = bytestream2_get_byte(gb);
+cursor_hot_y = bytestream2_get_byte(gb);
+cursor_fmt = bytestream2_get_byte(gb);
cursor_stride = FFALIGN(cursor_w, 32) * 4;
@@ -540,7 +542,7 @@ static int g2m_load_cursor(AVCodecContext *avctx,
G2MContext *c,
bits = bytestream2_get_be32(gb);
for (k = 0; k 32; k++) {
dst[0] = !!(bits 0x8000);
-dst += 4;
+dst += 4;
bits = 1;
}
}
@@ -555,18 +557,24 @@ static int g2m_load_cursor(AVCodecContext *avctx,
G2MContext *c,
int mask_bit = !!(bits 0x8000);
switch (dst[0] * 2 + mask_bit) {
case 0:
-dst[0] = 0xFF; dst[1] = 0x00;
-dst[2] = 0x00; dst[3] = 0x00;
+dst[0] = 0xFF;
+dst[1] = 0x00;
+dst[2] = 0x00;
+dst[3] = 0x00;
break;
case 1:
-dst[0] = 0xFF; dst[1] = 0xFF;
-dst[2] = 0xFF; dst[3] = 0xFF;
+dst[0] = 0xFF;
+dst[1] = 0xFF;
+dst[2] = 0xFF;
+dst[3] = 0xFF;
break;
default:
-dst[0] = 0x00; dst[1] = 0x00;
-dst[2] = 0x00; dst[3] = 0x00;
+dst[0] = 0x00;
+dst[1] = 0x00;
+dst[2] = 0x00;
+dst[3] = 0x00;
}
-dst += 4;
+dst += 4;
bits = 1;
}
}
@@ -727,10 +735,10 @@ static int g2m_decode_frame(AVCodecContext *avctx, void
*data,
}
c-tiles_x = (c-width + c-tile_width - 1) / c-tile_width;
[libav-commits] rv10: Forward error from rv10_decode_packet
Module: libav Branch: master Commit: b4d372e091f6b30758db2a43a5a9fe2510ec2b13 Author:Keiji Costantini stri...@gmail.com Committer: Diego Biurrun di...@biurrun.de Date: Sat Mar 1 19:44:00 2014 +0100 rv10: Forward error from rv10_decode_packet Signed-off-by: Diego Biurrun di...@biurrun.de --- libavcodec/rv10.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index ae8c5b3..51affa8 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -707,7 +707,10 @@ static int rv10_decode_frame(AVCodecContext *avctx, offset + FFMAX(size, size2) buf_size) return AVERROR_INVALIDDATA; -if (rv10_decode_packet(avctx, buf + offset, size, size2) 8 * size) +if ((ret = rv10_decode_packet(avctx, buf + offset, size, size2)) 0) +return ret; + +if (ret 8 * size) i++; } ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] rv10: KR formatting cosmetics
Module: libav
Branch: master
Commit: 8c09532672d7d3196ec52afefa2c96633bc17b62
Author:Keiji Costantini stri...@gmail.com
Committer: Diego Biurrun di...@biurrun.de
Date: Sat Mar 1 19:44:01 2014 +0100
rv10: KR formatting cosmetics
Also sort #includes into canonical order.
Signed-off-by: Diego Biurrun di...@biurrun.de
---
libavcodec/rv10.c | 107 +++--
1 file changed, 63 insertions(+), 44 deletions(-)
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 51affa8..771d5a8 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -26,18 +26,19 @@
*/
#include libavutil/imgutils.h
+
#include avcodec.h
#include error_resilience.h
+#include h263.h
#include internal.h
#include mpegvideo.h
#include mpeg4video.h
-#include h263.h
#define RV_GET_MAJOR_VER(x) ((x) 28)
#define RV_GET_MINOR_VER(x) (((x) 20) 0xFF)
#define RV_GET_MICRO_VER(x) (((x) 12) 0xFF)
-#define DC_VLC_BITS 14 //FIXME find a better solution
+#define DC_VLC_BITS 14 // FIXME find a better solution
typedef struct RVDecContext {
MpegEncContext m;
@@ -194,18 +195,18 @@ int ff_rv_decode_dc(MpegEncContext *s, int n)
code = get_vlc2(s-gb, rv_dc_lum.table, DC_VLC_BITS, 2);
if (code 0) {
/* XXX: I don't understand why they use LONGER codes than
- necessary. The following code would be completely useless
- if they had thought about it !!! */
+ * necessary. The following code would be completely useless
+ * if they had thought about it !!! */
code = get_bits(s-gb, 7);
if (code == 0x7c) {
-code = (int8_t)(get_bits(s-gb, 7) + 1);
+code = (int8_t) (get_bits(s-gb, 7) + 1);
} else if (code == 0x7d) {
code = -128 + get_bits(s-gb, 7);
} else if (code == 0x7e) {
if (get_bits1(s-gb) == 0)
-code = (int8_t)(get_bits(s-gb, 8) + 1);
+code = (int8_t) (get_bits(s-gb, 8) + 1);
else
-code = (int8_t)(get_bits(s-gb, 8));
+code = (int8_t) (get_bits(s-gb, 8));
} else if (code == 0x7f) {
skip_bits(s-gb, 11);
code = 1;
@@ -219,7 +220,7 @@ int ff_rv_decode_dc(MpegEncContext *s, int n)
if (code 0) {
code = get_bits(s-gb, 9);
if (code == 0x1fc) {
-code = (int8_t)(get_bits(s-gb, 7) + 1);
+code = (int8_t) (get_bits(s-gb, 7) + 1);
} else if (code == 0x1fd) {
code = -128 + get_bits(s-gb, 7);
} else if (code == 0x1fe) {
@@ -277,7 +278,7 @@ static int rv10_decode_picture_header(MpegEncContext *s)
}
}
/* if multiple packets per frame are sent, the position at which
- to display the macroblocks is coded here */
+ * to display the macroblocks is coded here */
mb_xy = s-mb_x + s-mb_y * s-mb_width;
if (show_bits(s-gb, 12) == 0 || (mb_xy mb_xy s-mb_num)) {
@@ -290,7 +291,7 @@ static int rv10_decode_picture_header(MpegEncContext *s)
mb_count = s-mb_width * s-mb_height;
}
skip_bits(s-gb, 3); /* ignored */
-s-f_code = 1;
+s-f_code = 1;
s-unrestricted_mv = 1;
return mb_count;
@@ -304,10 +305,18 @@ static int rv20_decode_picture_header(RVDecContext *rv)
i = get_bits(s-gb, 2);
switch (i) {
-case 0: s-pict_type = AV_PICTURE_TYPE_I; break;
-case 1: s-pict_type = AV_PICTURE_TYPE_I; break; //hmm ...
-case 2: s-pict_type = AV_PICTURE_TYPE_P; break;
-case 3: s-pict_type = AV_PICTURE_TYPE_B; break;
+case 0:
+s-pict_type = AV_PICTURE_TYPE_I;
+break;
+case 1:
+s-pict_type = AV_PICTURE_TYPE_I;
+break; // hmm ...
+case 2:
+s-pict_type = AV_PICTURE_TYPE_P;
+break;
+case 3:
+s-pict_type = AV_PICTURE_TYPE_B;
+break;
default:
av_log(s-avctx, AV_LOG_ERROR, unknown frame type\n);
return AVERROR_INVALIDDATA;
@@ -350,10 +359,10 @@ static int rv20_decode_picture_header(RVDecContext *rv)
return AVERROR_INVALIDDATA;
}
-new_w = 4 * ((uint8_t*)s-avctx-extradata)[6 + 2 * f];
-new_h = 4 * ((uint8_t*)s-avctx-extradata)[7 + 2 * f];
+new_w = 4 * ((uint8_t *) s-avctx-extradata)[6 + 2 * f];
+new_h = 4 * ((uint8_t *) s-avctx-extradata)[7 + 2 * f];
} else {
-new_w = s-orig_width ;
+new_w = s-orig_width;
new_h = s-orig_height;
}
if (new_w != s-width || new_h != s-height) {
@@ -406,7 +415,8 @@ static int rv20_decode_picture_header(RVDecContext *rv)
s-no_rounding = get_bits1(s-gb);
if (RV_GET_MINOR_VER(rv-sub_id) = 1 s-pict_type == AV_PICTURE_TYPE_B)
-skip_bits(s-gb, 5); // binary
[libav-commits] arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Module: libav
Branch: master
Commit: 61985ad72c47bbb668f2d3923bf5c9df83e79323
Author:Janne Grunau janne-li...@jannau.net
Committer: Janne Grunau janne-li...@jannau.net
Date: Sat Mar 8 11:52:14 2014 +0100
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.
CC: libav-sta...@libav.org
---
libavcodec/arm/hpeldsp_armv6.S | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/arm/hpeldsp_armv6.S b/libavcodec/arm/hpeldsp_armv6.S
index 984e0f0..f1abc32 100644
--- a/libavcodec/arm/hpeldsp_armv6.S
+++ b/libavcodec/arm/hpeldsp_armv6.S
@@ -132,12 +132,11 @@ function ff_put_pixels8_y2_armv6, export=1
uhadd8 r9, r5, r7
eor r11, r5, r7
and r10, r10, r12
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uadd8 r8, r8, r10
and r11, r11, r12
uadd8 r9, r9, r11
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r10, r4, r6
eor r6, r4, r6
uhadd8 r11, r5, r7
@@ -194,10 +193,9 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1
1:
subsr3, r3, #2
uhadd8 r8, r4, r6
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uhadd8 r9, r5, r7
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r12, r4, r6
ldrc_prene, r6, r1, r2
uhadd8 r14, r5, r7
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] matroskaenc: allow override of writing application tag
Module: libav Branch: master Commit: 0092c1dd8dac2d9e185b58503b447a0d3fb5230d Author:John Stebbins stebb...@jetheaddev.com Committer: Tim Walker tdskywal...@gmail.com Date: Mon Mar 3 20:20:14 2014 + matroskaenc: allow override of writing application tag Signed-off-by: Tim Walker tdskywal...@gmail.com CC: libav-sta...@libav.org --- libavformat/matroskaenc.c |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index cc645a5..3ab3139 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -805,7 +805,8 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme end_ebml_master(s-pb, targets); while ((t = av_dict_get(m, , t, AV_DICT_IGNORE_SUFFIX))) -if (av_strcasecmp(t-key, title)) +if (av_strcasecmp(t-key, title) +av_strcasecmp(t-key, encoding_tool)) mkv_write_simpletag(s-pb, t); end_ebml_master(s-pb, tag); @@ -965,7 +966,10 @@ static int mkv_write_header(AVFormatContext *s) segment_uid[i] = av_lfg_get(lfg); put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT); -put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); +if ((tag = av_dict_get(s-metadata, encoding_tool, NULL, 0))) +put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, tag-value); +else +put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); } ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] movenc: allow override of writing application tag
Module: libav Branch: master Commit: 565e0c6d866ce08d4b06427456d3d1f4fd856e9c Author:John Stebbins stebb...@jetheaddev.com Committer: Tim Walker tdskywal...@gmail.com Date: Mon Mar 3 20:20:15 2014 + movenc: allow override of writing application tag Signed-off-by: Tim Walker tdskywal...@gmail.com CC: libav-sta...@libav.org --- libavformat/movenc.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 762cfef..6344e38 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1858,7 +1858,8 @@ static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, mov_write_string_metadata(s, pb, \251wrt, composer , 1); mov_write_string_metadata(s, pb, \251alb, album, 1); mov_write_string_metadata(s, pb, \251day, date , 1); -mov_write_string_tag(pb, \251too, LIBAVFORMAT_IDENT, 0, 1); +if (!mov_write_string_metadata(s, pb, \251too, encoding_tool, 1)) +mov_write_string_tag(pb, \251too, LIBAVFORMAT_IDENT, 0, 1); mov_write_string_metadata(s, pb, \251cmt, comment , 1); mov_write_string_metadata(s, pb, \251gen, genre, 1); mov_write_string_metadata(s, pb, \251cpy, copyright, 1); ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] build: Use pkg-config for openjpeg
Module: libav Branch: master Commit: 0e0cefb22216a4b6684a30a50cb5973400dc59f2 Author:Pierre Lejeune superhe...@gmail.com Committer: Tim Walker tdskywal...@gmail.com Date: Sat Mar 8 12:19:17 2014 + build: Use pkg-config for openjpeg Bug-Id: 387 CC: libav-sta...@libav.org --- configure |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4d7382a..0ac7328 100755 --- a/configure +++ b/configure @@ -3957,7 +3957,7 @@ enabled libmp3lame require libmp3lame = 3.98.3 lame/lame.h lame_set enabled libopencore_amrnb require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb enabled libopencore_amrwb require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencv require_pkg_config opencv opencv/cv.h cvCreateImageHeader -enabled libopenjpegrequire libopenjpeg openjpeg.h opj_version -lopenjpeg +enabled libopenjpegrequire_pkg_config libopenjpeg openjpeg.h opj_version enabled libopusrequire_pkg_config opus opus_multistream.h opus_multistream_decoder_create enabled libpulse require_pkg_config libpulse-simple pulse/simple.h pa_simple_new enabled librtmprequire_pkg_config librtmp librtmp/rtmp.h RTMP_Socket ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Module: libav
Branch: release/10
Commit: 23af29e8825ac112877b9ac0572ef11e5f0539f2
Author:Janne Grunau janne-li...@jannau.net
Committer: Janne Grunau janne-li...@jannau.net
Date: Sat Mar 8 11:52:14 2014 +0100
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.
---
libavcodec/arm/hpeldsp_armv6.S | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/arm/hpeldsp_armv6.S b/libavcodec/arm/hpeldsp_armv6.S
index 984e0f0..f1abc32 100644
--- a/libavcodec/arm/hpeldsp_armv6.S
+++ b/libavcodec/arm/hpeldsp_armv6.S
@@ -132,12 +132,11 @@ function ff_put_pixels8_y2_armv6, export=1
uhadd8 r9, r5, r7
eor r11, r5, r7
and r10, r10, r12
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uadd8 r8, r8, r10
and r11, r11, r12
uadd8 r9, r9, r11
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r10, r4, r6
eor r6, r4, r6
uhadd8 r11, r5, r7
@@ -194,10 +193,9 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1
1:
subsr3, r3, #2
uhadd8 r8, r4, r6
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uhadd8 r9, r5, r7
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r12, r4, r6
ldrc_prene, r6, r1, r2
uhadd8 r14, r5, r7
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Module: libav
Branch: release/9
Commit: 7a2254ab26b24255a4d6ea476ba5fd38525a9bb3
Author:Janne Grunau janne-li...@jannau.net
Committer: Janne Grunau j...@jannau.net
Date: Sat Mar 8 11:52:14 2014 +0100
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.
---
libavcodec/arm/dsputil_armv6.S | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S
index 616f5c0..2230613 100644
--- a/libavcodec/arm/dsputil_armv6.S
+++ b/libavcodec/arm/dsputil_armv6.S
@@ -132,12 +132,11 @@ function ff_put_pixels8_y2_armv6, export=1
uhadd8 r9, r5, r7
eor r11, r5, r7
and r10, r10, r12
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uadd8 r8, r8, r10
and r11, r11, r12
uadd8 r9, r9, r11
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r10, r4, r6
eor r6, r4, r6
uhadd8 r11, r5, r7
@@ -194,10 +193,9 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1
1:
subsr3, r3, #2
uhadd8 r8, r4, r6
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uhadd8 r9, r5, r7
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r12, r4, r6
ldrc_prene, r6, r1, r2
uhadd8 r14, r5, r7
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] timer: use mach_absolute_time as high resolution clock on darwin
Module: libav
Branch: master
Commit: c708b5403346255ea5adc776645616cc7c61f078
Author:Janne Grunau j...@jannau.net
Committer: Janne Grunau janne-li...@jannau.net
Date: Fri Jan 24 01:15:31 2014 +0100
timer: use mach_absolute_time as high resolution clock on darwin
Not guaranteed to be in nanosecond resolution. On iOS 7 the duration
of one tick is 125/3 ns which is still more than an order of magnitude
better then microseconds.
Replace decicycles with the neutral UNITS. Decicycles is strange but
tenths of a nanosecond and unspecific deci-ticks for mach_absolute_time
is just silly.
---
configure |4
libavutil/timer.h | 14 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 0ac7328..766df99 100755
--- a/configure
+++ b/configure
@@ -1387,6 +1387,8 @@ HAVE_LIST=
local_aligned_8
localtime_r
loongson
+mach_absolute_time
+mach_mach_time_h
machine_ioctl_bt848_h
machine_ioctl_meteor_h
machine_rw_barrier
@@ -3853,6 +3855,7 @@ check_struct sys/time.h sys/resource.h struct rusage
ru_maxrss
check_func gettimeofday
check_func isatty
check_func localtime_r
+check_func mach_absolute_time
check_func ${malloc_prefix}memalign enable memalign
check_func mkstemp
check_func mmap
@@ -3887,6 +3890,7 @@ check_header dlfcn.h
check_header dxva.h
check_header dxva2api.h
check_header io.h
+check_header mach/mach_time.h
check_header malloc.h
check_header poll.h
check_header sys/mman.h
diff --git a/libavutil/timer.h b/libavutil/timer.h
index d2c5001..0d93d7c 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -32,6 +32,10 @@
#include config.h
+#if HAVE_MACH_MACH_TIME_H
+#include mach/mach_time.h
+#endif
+
#include log.h
#if ARCH_ARM
@@ -44,8 +48,12 @@
# include x86/timer.h
#endif
-#if !defined(AV_READ_TIME) HAVE_GETHRTIME
-# define AV_READ_TIME gethrtime
+#if !defined(AV_READ_TIME)
+# if HAVE_GETHRTIME
+# define AV_READ_TIME gethrtime
+# elif HAVE_MACH_ABSOLUTE_TIME
+# define AV_READ_TIME mach_absolute_time
+# endif
#endif
#ifdef AV_READ_TIME
@@ -68,7 +76,7 @@
tskip_count++;\
if (((tcount + tskip_count) (tcount + tskip_count - 1)) == 0) { \
av_log(NULL, AV_LOG_ERROR,\
- %PRIu64 decicycles in %s, %d runs, %d skips\n, \
+ %PRIu64 UNITS in %s, %d runs, %d skips\n, \
tsum * 10 / tcount, id, tcount, tskip_count); \
} \
}
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] float_dsp: fix errors in documentation
Module: libav
Branch: master
Commit: 74cc901905741ca3d9e8364f42239341f4f173c4
Author:Janne Grunau janne-li...@jannau.net
Committer: Janne Grunau janne-li...@jannau.net
Date: Sun Mar 2 20:33:49 2014 +0100
float_dsp: fix errors in documentation
---
libavutil/float_dsp.h |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavutil/float_dsp.h b/libavutil/float_dsp.h
index b215dad..0eb02f8 100644
--- a/libavutil/float_dsp.h
+++ b/libavutil/float_dsp.h
@@ -113,7 +113,7 @@ typedef struct AVFloatDSPContext {
* constraints: 32-byte aligned
* @param src1 second input vector
* constraints: 32-byte aligned
- * @param src1 third input vector
+ * @param src2 third input vector
* constraints: 32-byte aligned
* @param len number of elements in the input
* constraints: multiple of 16
@@ -132,8 +132,6 @@ typedef struct AVFloatDSPContext {
* constraints: 32-byte aligned
* @param src1 second input vector
* constraints: 32-byte aligned
- * @param src1 third input vector
- * constraints: 32-byte aligned
* @param len number of elements in the input
* constraints: multiple of 16
*/
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] aarch64: get_cabac inline asm
Module: libav
Branch: master
Commit: dfe224f377be3e45758c69d881ca7874b82d647a
Author:Janne Grunau janne-li...@jannau.net
Committer: Janne Grunau janne-li...@jannau.net
Date: Mon Jan 13 01:06:20 2014 +0100
aarch64: get_cabac inline asm
Based on the x86 branchless get_cabac asm. get_cabac_noinline() gets
approximately 20% faster (no cycle counts available) compared to clang
from Xcode 5.1 beta5. More than 6% faster overall. A part of the overall
speedup might be explained by additional inlining of get_cabac().
---
libavcodec/aarch64/cabac.h | 104 ++
libavcodec/cabac.h |1 +
libavcodec/cabac_functions.h |4 +-
3 files changed, 108 insertions(+), 1 deletion(-)
diff --git a/libavcodec/aarch64/cabac.h b/libavcodec/aarch64/cabac.h
new file mode 100644
index 000..e12953e
--- /dev/null
+++ b/libavcodec/aarch64/cabac.h
@@ -0,0 +1,104 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_AARCH64_CABAC_H
+#define AVCODEC_AARCH64_CABAC_H
+
+#include config.h
+#if HAVE_INLINE_ASM
+
+#include libavutil/attributes.h
+#include libavutil/internal.h
+#include libavcodec/cabac.h
+
+#define get_cabac_inline get_cabac_inline_aarch64
+static av_always_inline int get_cabac_inline_aarch64(CABACContext *c,
+ uint8_t *const state)
+{
+int bit;
+void *reg_a, *reg_b, *reg_c, *tmp;
+
+__asm__ volatile(
+ldrb %w[bit] , [%[state]] \n\t
+add%[r_b], %[tables] , %[lps_off]\n\t
+mov%w[tmp] , %w[range] \n\t
+and%w[range] , %w[range] , #0xC0 \n\t
+lsl%w[r_c] , %w[range] , #1\n\t
+add%[r_b], %[r_b] , %w[bit], UXTW \n\t
+ldrb %w[range] , [%[r_b], %w[r_c], SXTW] \n\t
+sub%w[r_c] , %w[tmp] , %w[range] \n\t
+lsl%w[tmp] , %w[r_c] , #17 \n\t
+cmp%w[tmp] , %w[low] \n\t
+csel %w[tmp] , %w[tmp] , wzr , cc \n\t
+csel %w[range] , %w[r_c] , %w[range], gt \n\t
+cinv %w[bit] , %w[bit] , cc\n\t
+sub%w[low] , %w[low] , %w[tmp] \n\t
+add%[r_b], %[tables] , %[norm_off] \n\t
+add%[r_a], %[tables] , %[mlps_off] \n\t
+ldrb %w[tmp] , [%[r_b], %w[range], SXTW] \n\t
+ldrb %w[r_a] , [%[r_a], %w[bit], SXTW] \n\t
+lsl%w[low] , %w[low] , %w[tmp] \n\t
+lsl%w[range] , %w[range] , %w[tmp] \n\t
+uxth %w[r_c] , %w[low] \n\t
+strb %w[r_a] , [%[state]] \n\t
+cbnz %w[r_c] , 2f \n\t
+ldr%[r_c], [%[c], %[byte]] \n\t
+ldr%[r_a], [%[c], %[end]] \n\t
+ldrh %w[tmp] , [%[r_c]]\n\t
+cmp%[r_c], %[r_a] \n\t
+b.ge 1f \n\t
+add%[r_a], %[r_c] , #2\n\t
+str%[r_a], [%[c], %[byte]] \n\t
+1: \n\t
+sub%w[r_c] , %w[low] , #1\n\t
+eor%w[r_c] , %w[r_c] , %w[low] \n\t
+rev%w[tmp] , %w[tmp] \n\t
+lsr%w[r_c] , %w[r_c] , #15 \n\t
+lsr%w[tmp] , %w[tmp] , #15 \n\t
+ldrb %w[r_c] , [%[r_b], %w[r_c], SXTW] \n\t
+mov%w[r_b] , #0x \n\t
+mov%w[r_a] , #7 \n\t
+sub%w[tmp] , %w[tmp] , %w[r_b] \n\t
+sub%w[r_c] , %w[r_a] ,
[libav-commits] arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Module: libav Branch: master Commit: 4506a854a4d846692ba71daeeff661dc214c8fa2 Author:Janne Grunau janne-li...@jannau.net Committer: Janne Grunau janne-li...@jannau.net Date: Sat Mar 8 19:15:16 2014 +0100 arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration Was missed in aeaf268e52fc11c1f64914a319e0edddf1346d6a when integrating clear_blocks into the idct. --- libavcodec/arm/vp3dsp_init_arm.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/arm/vp3dsp_init_arm.c b/libavcodec/arm/vp3dsp_init_arm.c index dfd6078..1ab0852 100644 --- a/libavcodec/arm/vp3dsp_init_arm.c +++ b/libavcodec/arm/vp3dsp_init_arm.c @@ -26,7 +26,7 @@ void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, int16_t *data); void ff_vp3_idct_add_neon(uint8_t *dest, int line_size, int16_t *data); -void ff_vp3_idct_dc_add_neon(uint8_t *dest, int line_size, const int16_t *data); +void ff_vp3_idct_dc_add_neon(uint8_t *dest, int line_size, int16_t *data); void ff_vp3_v_loop_filter_neon(uint8_t *, int, int *); void ff_vp3_h_loop_filter_neon(uint8_t *, int, int *); ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] arm: get_cabac inline asm
Module: libav
Branch: master
Commit: 634d9d8b398982647b3d7160641198744901d8d8
Author:Janne Grunau janne-li...@jannau.net
Committer: Janne Grunau janne-li...@jannau.net
Date: Wed Jan 29 14:48:22 2014 +0100
arm: get_cabac inline asm
Based on the aarch64 asm. CPU cycle counts on cortex-a9 compared to
gcc 4.8.2:
before: 475 decicycles in get_cabac_noinline, 67106035 runs, 2829 skips
after: 393 decicycles in get_cabac_noinline, 67106474 runs, 2390 skips
Overall speedup is above 2%. Code generated by clang 3.4 is slower on
the same hardware and the relative change is a little larger.
---
libavcodec/arm/cabac.h | 102 ++
libavcodec/cabac_functions.h |3 ++
2 files changed, 105 insertions(+)
diff --git a/libavcodec/arm/cabac.h b/libavcodec/arm/cabac.h
new file mode 100644
index 000..6ff5f1a
--- /dev/null
+++ b/libavcodec/arm/cabac.h
@@ -0,0 +1,102 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_ARM_CABAC_H
+#define AVCODEC_ARM_CABAC_H
+
+#include config.h
+#if HAVE_ARMV6T2_INLINE
+
+#include libavutil/attributes.h
+#include libavutil/internal.h
+#include libavcodec/cabac.h
+
+#define get_cabac_inline get_cabac_inline_arm
+static av_always_inline int get_cabac_inline_arm(CABACContext *c,
+ uint8_t *const state)
+{
+int bit;
+void *reg_b, *reg_c, *tmp;
+
+__asm__ volatile(
+ldrb %[bit], [%[state]] \n\t
+add%[r_b], %[tables] , %[lps_off]\n\t
+mov%[tmp], %[range]\n\t
+and%[range] , %[range], #0xC0 \n\t
+add%[r_b], %[r_b] , %[bit]\n\t
+ldrb %[range] , [%[r_b], %[range], lsl #1] \n\t
+add%[r_b], %[tables] , %[norm_off] \n\t
+sub%[r_c], %[tmp] , %[range] \n\t
+lsl%[tmp], %[r_c] , #17 \n\t
+cmp%[tmp], %[low] \n\t
+it gt \n\t
+movgt %[range] , %[r_c] \n\t
+ittcc \n\t
+mvncc %[bit], %[bit] \n\t
+subcc %[low], %[low] , %[tmp]\n\t
+add%[r_c], %[tables] , %[mlps_off] \n\t
+ldrb %[tmp], [%[r_b], %[range]] \n\t
+ldrb %[r_b], [%[r_c], %[bit]]\n\t
+lsl%[low], %[low] , %[tmp]\n\t
+lsl%[range] , %[range], %[tmp]\n\t
+uxth %[r_c], %[low] \n\t
+strb %[r_b], [%[state]] \n\t
+tst%[r_c], %[r_c] \n\t
+bne2f \n\t
+ldr%[r_c], [%[c], %[byte]] \n\t
+ldr%[r_b], [%[c], %[end]] \n\t
+ldrh %[tmp], [%[r_c]]\n\t
+cmp%[r_c], %[r_b] \n\t
+ittlt \n\t
+addlt %[r_c], %[r_c] , #2\n\t
+strlt %[r_c], [%[c], %[byte]] \n\t
+sub%[r_c], %[low] , #1\n\t
+add%[r_b], %[tables] , %[norm_off] \n\t
+eor%[r_c], %[low] , %[r_c]\n\t
+rev%[tmp], %[tmp] \n\t
+lsr%[r_c], %[r_c] , #15 \n\t
+lsr%[tmp], %[tmp] , #15 \n\t
+ldrb %[r_c], [%[r_b], %[r_c]]\n\t
+movw %[r_b], #0x \n\t
+sub%[tmp], %[tmp] , %[r_b]\n\t
+rsb%[r_c], %[r_c] , #7\n\t
+
[libav-commits] arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
Module: libav
Branch: release/0.8
Commit: 0120e480bf0a1257299c8c84416a8814ccfcc73b
Author:Janne Grunau janne-li...@jannau.net
Committer: Janne Grunau janne-li...@jannau.net
Date: Sat Mar 8 11:52:14 2014 +0100
arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6
The overread avoidance fix in cbddee1cca0ebd01e8c5aa694d31228eb4de4b41
broke the computation for the last row since it prevented the safe
reading from the height+1-th row.
---
libavcodec/arm/dsputil_armv6.S | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavcodec/arm/dsputil_armv6.S b/libavcodec/arm/dsputil_armv6.S
index e4f71cb..25074b4 100644
--- a/libavcodec/arm/dsputil_armv6.S
+++ b/libavcodec/arm/dsputil_armv6.S
@@ -134,12 +134,11 @@ function ff_put_pixels8_y2_armv6, export=1
uhadd8 r9, r5, r7
eor r11, r5, r7
and r10, r10, r12
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uadd8 r8, r8, r10
and r11, r11, r12
uadd8 r9, r9, r11
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r10, r4, r6
eor r6, r4, r6
uhadd8 r11, r5, r7
@@ -196,10 +195,9 @@ function ff_put_pixels8_y2_no_rnd_armv6, export=1
1:
subsr3, r3, #2
uhadd8 r8, r4, r6
-ldrc_prene, r4, r1, r2
+ldr_pre r4, r1, r2
uhadd8 r9, r5, r7
-it ne
-ldrne r5, [r1, #4]
+ldr r5, [r1, #4]
uhadd8 r12, r4, r6
ldrc_prene, r6, r1, r2
uhadd8 r14, r5, r7
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] fic: Properly handle skip frames
Module: libav
Branch: release/10
Commit: a643a47d41f4924b66fce339e4b82aaee20825be
Author:Derek Buitenhuis derek.buitenh...@gmail.com
Committer: Reinhard Tartler siret...@tauware.de
Date: Fri Mar 7 14:31:53 2014 +
fic: Properly handle skip frames
Signed-off-by: Derek Buitenhuis derek.buitenh...@gmail.com
(cherry picked from commit f87a6e500bcdaede22a123b81a2a46779cf7b71a)
---
libavcodec/fic.c |5 +
1 file changed, 5 insertions(+)
diff --git a/libavcodec/fic.c b/libavcodec/fic.c
index 9a3bc3e..df03437 100644
--- a/libavcodec/fic.c
+++ b/libavcodec/fic.c
@@ -166,6 +166,10 @@ static int fic_decode_frame(AVCodecContext *avctx, void
*data,
if (memcmp(src, fic_header, 7))
av_log(avctx, AV_LOG_WARNING, Invalid FIC Header.\n);
+/* Is it a skip frame? */
+if (src[17])
+goto skip;
+
nslices = src[13];
if (!nslices) {
av_log(avctx, AV_LOG_ERROR, Zero slices found.\n);
@@ -245,6 +249,7 @@ static int fic_decode_frame(AVCodecContext *avctx, void
*data,
NULL, nslices, sizeof(ctx-slice_data[0])) 0)
return ret;
+skip:
*got_frame = 1;
if ((ret = av_frame_ref(data, ctx-frame)) 0)
return ret;
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] rv10: Forward error from rv10_decode_packet
Module: libav Branch: release/10 Commit: db67b7c31b6fdd3747e2b5328945ad2091533698 Author:Keiji Costantini stri...@gmail.com Committer: Reinhard Tartler siret...@tauware.de Date: Sat Mar 1 19:44:00 2014 +0100 rv10: Forward error from rv10_decode_packet Signed-off-by: Diego Biurrun di...@biurrun.de (cherry picked from commit b4d372e091f6b30758db2a43a5a9fe2510ec2b13) --- libavcodec/rv10.c |5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index ae8c5b3..51affa8 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -707,7 +707,10 @@ static int rv10_decode_frame(AVCodecContext *avctx, offset + FFMAX(size, size2) buf_size) return AVERROR_INVALIDDATA; -if (rv10_decode_packet(avctx, buf + offset, size, size2) 8 * size) +if ((ret = rv10_decode_packet(avctx, buf + offset, size, size2)) 0) +return ret; + +if (ret 8 * size) i++; } ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] float_dsp: fix errors in documentation
Module: libav
Branch: release/10
Commit: 0ede7b534483c5c90f404a8f11f776d2f2da4e7e
Author:Janne Grunau janne-li...@jannau.net
Committer: Reinhard Tartler siret...@tauware.de
Date: Sun Mar 2 20:33:49 2014 +0100
float_dsp: fix errors in documentation
(cherry picked from commit 74cc901905741ca3d9e8364f42239341f4f173c4)
---
libavutil/float_dsp.h |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavutil/float_dsp.h b/libavutil/float_dsp.h
index b215dad..0eb02f8 100644
--- a/libavutil/float_dsp.h
+++ b/libavutil/float_dsp.h
@@ -113,7 +113,7 @@ typedef struct AVFloatDSPContext {
* constraints: 32-byte aligned
* @param src1 second input vector
* constraints: 32-byte aligned
- * @param src1 third input vector
+ * @param src2 third input vector
* constraints: 32-byte aligned
* @param len number of elements in the input
* constraints: multiple of 16
@@ -132,8 +132,6 @@ typedef struct AVFloatDSPContext {
* constraints: 32-byte aligned
* @param src1 second input vector
* constraints: 32-byte aligned
- * @param src1 third input vector
- * constraints: 32-byte aligned
* @param len number of elements in the input
* constraints: multiple of 16
*/
___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] matroskaenc: allow override of writing application tag
Module: libav Branch: release/10 Commit: daa5a988e2ec8275ad8b724ea68f78306c271ae7 Author:John Stebbins stebb...@jetheaddev.com Committer: Reinhard Tartler siret...@tauware.de Date: Mon Mar 3 20:20:14 2014 + matroskaenc: allow override of writing application tag Signed-off-by: Tim Walker tdskywal...@gmail.com CC: libav-sta...@libav.org (cherry picked from commit 0092c1dd8dac2d9e185b58503b447a0d3fb5230d) --- libavformat/matroskaenc.c |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index cc645a5..3ab3139 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -805,7 +805,8 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme end_ebml_master(s-pb, targets); while ((t = av_dict_get(m, , t, AV_DICT_IGNORE_SUFFIX))) -if (av_strcasecmp(t-key, title)) +if (av_strcasecmp(t-key, title) +av_strcasecmp(t-key, encoding_tool)) mkv_write_simpletag(s-pb, t); end_ebml_master(s-pb, tag); @@ -965,7 +966,10 @@ static int mkv_write_header(AVFormatContext *s) segment_uid[i] = av_lfg_get(lfg); put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , LIBAVFORMAT_IDENT); -put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); +if ((tag = av_dict_get(s-metadata, encoding_tool, NULL, 0))) +put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, tag-value); +else +put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); } ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration
Module: libav Branch: release/10 Commit: 5b933be089ab2657eb754ebf5b804ae43badf13d Author:Janne Grunau janne-li...@jannau.net Committer: Reinhard Tartler siret...@tauware.de Date: Sat Mar 8 19:15:16 2014 +0100 arm: vp3: remove incorrect const in ff_vp3_idct_dc_add_neon declaration Was missed in aeaf268e52fc11c1f64914a319e0edddf1346d6a when integrating clear_blocks into the idct. (cherry picked from commit 4506a854a4d846692ba71daeeff661dc214c8fa2) --- libavcodec/arm/vp3dsp_init_arm.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/arm/vp3dsp_init_arm.c b/libavcodec/arm/vp3dsp_init_arm.c index dfd6078..1ab0852 100644 --- a/libavcodec/arm/vp3dsp_init_arm.c +++ b/libavcodec/arm/vp3dsp_init_arm.c @@ -26,7 +26,7 @@ void ff_vp3_idct_put_neon(uint8_t *dest, int line_size, int16_t *data); void ff_vp3_idct_add_neon(uint8_t *dest, int line_size, int16_t *data); -void ff_vp3_idct_dc_add_neon(uint8_t *dest, int line_size, const int16_t *data); +void ff_vp3_idct_dc_add_neon(uint8_t *dest, int line_size, int16_t *data); void ff_vp3_v_loop_filter_neon(uint8_t *, int, int *); void ff_vp3_h_loop_filter_neon(uint8_t *, int, int *); ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] movenc: allow override of writing application tag
Module: libav Branch: release/10 Commit: c3861e14ceace7ee69820091871173b4abcae311 Author:John Stebbins stebb...@jetheaddev.com Committer: Reinhard Tartler siret...@tauware.de Date: Mon Mar 3 20:20:15 2014 + movenc: allow override of writing application tag Signed-off-by: Tim Walker tdskywal...@gmail.com CC: libav-sta...@libav.org (cherry picked from commit 565e0c6d866ce08d4b06427456d3d1f4fd856e9c) --- libavformat/movenc.c |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 43a1647..5bc0ca3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1858,7 +1858,8 @@ static int mov_write_ilst_tag(AVIOContext *pb, MOVMuxContext *mov, mov_write_string_metadata(s, pb, \251wrt, composer , 1); mov_write_string_metadata(s, pb, \251alb, album, 1); mov_write_string_metadata(s, pb, \251day, date , 1); -mov_write_string_tag(pb, \251too, LIBAVFORMAT_IDENT, 0, 1); +if (!mov_write_string_metadata(s, pb, \251too, encoding_tool, 1)) +mov_write_string_tag(pb, \251too, LIBAVFORMAT_IDENT, 0, 1); mov_write_string_metadata(s, pb, \251cmt, comment , 1); mov_write_string_metadata(s, pb, \251gen, genre, 1); mov_write_string_metadata(s, pb, \251cpy, copyright, 1); ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] build: Use pkg-config for openjpeg
Module: libav Branch: release/10 Commit: f2693e98b449592ec0ed4979220814bf54e60a16 Author:Pierre Lejeune superhe...@gmail.com Committer: Reinhard Tartler siret...@tauware.de Date: Sat Mar 8 12:19:17 2014 + build: Use pkg-config for openjpeg Bug-Id: 387 CC: libav-sta...@libav.org (cherry picked from commit 0e0cefb22216a4b6684a30a50cb5973400dc59f2) --- configure |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 11f157d..ae504da 100755 --- a/configure +++ b/configure @@ -3940,7 +3940,7 @@ enabled libmp3lame require libmp3lame = 3.98.3 lame/lame.h lame_set enabled libopencore_amrnb require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb enabled libopencore_amrwb require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencv require_pkg_config opencv opencv/cv.h cvCreateImageHeader -enabled libopenjpegrequire libopenjpeg openjpeg.h opj_version -lopenjpeg +enabled libopenjpegrequire_pkg_config libopenjpeg openjpeg.h opj_version enabled libopusrequire_pkg_config opus opus_multistream.h opus_multistream_decoder_create enabled libpulse require_pkg_config libpulse-simple pulse/simple.h pa_simple_new enabled librtmprequire_pkg_config librtmp librtmp/rtmp.h RTMP_Socket ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
[libav-commits] changelog: Cleanups and prepare for v10_beta2
Module: libav Branch: release/10 Commit: e4cbd0d6e5a7b3b850d72f4f4ef0124b27dbdcbd Author:Reinhard Tartler siret...@tauware.de Committer: Reinhard Tartler siret...@tauware.de Date: Sat Mar 8 20:50:36 2014 -0500 changelog: Cleanups and prepare for v10_beta2 --- Changelog |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index 029b381..29902f4 100644 --- a/Changelog +++ b/Changelog @@ -1,11 +1,12 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. -version next: +version 10~beta2: - compand audio filter +- and many various smaller fixes, for a full changelog, please refer to: + cf. https://git.libav.org/?p=libav.git;a=shortlog;h=refs/tags/v10_beta2 - -version 10: +version 10~beta1: - av_strnstr - support ID3v2 tags in ASF files - reference-counting for AVFrame and AVPacket data ___ libav-commits mailing list libav-commits@libav.org https://lists.libav.org/mailman/listinfo/libav-commits
