2ffe55a64f
avfilter/vf_zoompan: fix mixing of declarations and statements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 17:27:34 +02:00
375fa06125
Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'
...
* commit '1619274fb393f55a365cc10f88faa173c9a8e772':
av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 17:25:09 +02:00
383d8ddf29
Merge commit '7b06ddb8352fe7f434414d7911ced94956bb25b2'
...
* commit '7b06ddb8352fe7f434414d7911ced94956bb25b2':
configure: use .altmacro for gnu as check on arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 16:48:08 +02:00
f341340552
swr: handle 64bit overflow check in multiple_resample().
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 15:24:51 +02:00
637093a2db
avcodec/utvideoenc: skip unused huffman entries
...
This very slightly improves compression
Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 15:11:53 +02:00
29a1164e60
avcodec/utvideodec: fix use of get_vlc2()
...
The max depth is 3
Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 14:56:00 +02:00
334aafe565
avcodec/huffman/ff_huff_gen_len_table: support skiping stat=0 entries
...
This is probably not the simplest solution but as this is needed for a bugfix,
simplification is left for later.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 14:56:00 +02:00
673716c54b
avcodec/utvideodec: Increase vlc len
...
Fixes a regression since fb3e380#2661 ,
reported by fluffrabbit at aol dot com.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 14:56:00 +02:00
4b6cb1cc69
Zoom & Pan filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-06-09 12:41:33 +00:00
1619274fb3
av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE
...
av_dict_set leaks it key/value arguments if AV_DICT_DONT_OVERWRITE is
combined with AV_DICT_DONT_STRDUP_{KEY,VAL} and the key exists.
2014-06-09 12:33:19 +02:00
7b06ddb835
configure: use .altmacro for gnu as check on arm
...
Clang's integrated assembler (after 3.4) does not yet support the
'.altmacro' directive which is only used in arm asm. Support is planned:
http://llvm.org/bugs/show_bug.cgi?id=18918
2014-06-09 12:33:19 +02:00
0accf24b15
cavsdec: fix qp fixed slice handling
...
Fixes Ticket3400
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 05:47:49 +02:00
52e563bb2f
avformat/cavsvideodec: Fix probing when the file extension is avs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 05:17:34 +02:00
345f2234d1
x86/scale: fix xmm register count for hscale*_sse2
...
xmm6 was being clobbered in ff_hscale8to{15,19}_8_sse2 on Win64
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 04:13:23 +02:00
6d408495b5
x86/dct32: don't build ff_dct32_float_sse on x86_64
...
There's an SSE2 version already, and technically the SSE version
on x86_64 was wrong (using pshufd and pshuflw, SSE2 instructions).
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-09 00:51:43 +02:00
7d8a60a442
avcodec/options_table: improve max/min rate help text
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 23:02:25 +02:00
85065d2a7c
x86/float_dsp: add missing femms
...
It was lost during the port.
Should fix fate on 3dnowext machines.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 20:06:28 +02:00
4959c4a793
avcodec/pthread_slice: Use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 16:34:50 +02:00
ab1e191720
avcodec/pthread_frame: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 16:34:20 +02:00
007547b282
avcodec: fix () in TRANSPOSE macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 15:26:18 +02:00
7c3af60016
avformat/movenc: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 15:26:03 +02:00
ee5145c05d
avcodec/aacpsy: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 15:14:03 +02:00
6e6bd5481c
avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized memory is possible
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 14:30:30 +02:00
dcaf9660b6
x86/float_dsp: port vector_fmul_window to yasm
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 12:41:32 +02:00
d4be3a8d63
configure: add llauddsp dependancy for wmalossless_decoder
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 03:10:24 +02:00
fc8db12a73
x86/vp9: inital AVX2 intra_pred
...
tos3k-vp9-b10000.webm on a Core i5-4200U @1.6GHz
1219 decicycles in ff_vp9_ipred_dc_32x32_ssse3, 131070 runs, 2 skips
439 decicycles in ff_vp9_ipred_dc_32x32_avx2, 131070 runs, 2 skips
3570 decicycles in ff_vp9_ipred_dc_top_32x32_ssse3, 4096 runs, 0 skips
2494 decicycles in ff_vp9_ipred_dc_top_32x32_avx2, 4096 runs, 0 skips
1419 decicycles in ff_vp9_ipred_dc_left_32x32_ssse3, 16384 runs, 0 skips
717 decicycles in ff_vp9_ipred_dc_left_32x32_avx2, 16384 runs, 0 skips
2737 decicycles in ff_vp9_ipred_tm_32x32_avx, 1024 runs, 0 skips
2088 decicycles in ff_vp9_ipred_tm_32x32_avx2, 1024 runs, 0 skips
3090 decicycles in ff_vp9_ipred_v_32x32_avx, 512 runs, 0 skips
2226 decicycles in ff_vp9_ipred_v_32x32_avx2, 512 runs, 0 skips
1565 decicycles in ff_vp9_ipred_h_32x32_avx, 1024 runs, 0 skips
922 decicycles in ff_vp9_ipred_h_32x32_avx2, 1024 runs, 0 skips
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-08 02:37:20 +02:00
5183fac92f
avcodec/hevc_sei: fix invalid get_bits() in a comment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 23:37:27 +02:00
01ef127bf8
ffmpeg: support setting AVStream.discard
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 21:26:22 +02:00
5affab960c
ffmpeg_opt: remove unused variable and undocumented and not working command line option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 21:13:08 +02:00
118c042116
avcodec/tscc2: fix macro ()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 17:44:23 +02:00
925bd174f2
avcodec/tta: fix macro ()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 17:44:14 +02:00
f240740712
avfilter/af_amix: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 15:06:14 +02:00
a62814abf4
avfilter/af_channelmap: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 15:05:51 +02:00
1c7ac94cdf
avfilter/af_aphaser: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 15:05:33 +02:00
3a10bf93b5
avdevice/lavfi: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 15:04:50 +02:00
b2d1e22c2a
avformat/udp: fix build on MINIX
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 14:43:07 +02:00
74760883fc
avformat/flvenc: Do not allow creating h263/mpeg4 in flv without unofficial format extensions being enabled.
...
Found-by: Jean-Baptiste Kempf <jb@videolan.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 12:03:31 +02:00
5a376976a0
avcodec/vorbisdec: Reset first_frame
...
This avoids returning a initial frame after seeking which does
not match what would be received when decoding from the begin.
Suggested-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 02:09:27 +02:00
71da91e887
avcodec/libvpxenc: update the ranges for "cpu_used" so it matches the "speed" alias
...
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 23:52:20 +02:00
5265e3e40f
avcodec/libvpxenc: Update the "cpu-used" options default to match the "speed" alias
...
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 23:50:03 +02:00
37cf695af0
Merge commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba'
...
* commit '3d79d0c93e5b37a35b1b22d6c18699c233aad1ba':
adpcm: Avoid reading out of bounds in the IMA QT trellis encoder
See: a32765c425
2014-06-06 23:42:54 +02:00
faabef3d3d
Merge commit '103243ca649cc305129ed0352bf4d97e5ddf4d80'
...
* commit '103243ca649cc305129ed0352bf4d97e5ddf4d80':
oggenc: Set the right AVOption size for the pref_duration option
See: 536baf6cc5
2014-06-06 23:36:12 +02:00
cd016db425
Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'
...
* commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362':
avcodec options: add enum option for color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 23:34:44 +02:00
00acf5c42a
Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'
...
* commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c':
avcodec options: add enum option for colorspace
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 23:19:45 +02:00
9e1d97aa06
Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'
...
* commit 'efc2dfe6a0238ec08769626db899ea910be24407':
avcodec options: add enum option for color_trc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 23:09:26 +02:00
58e501b1e9
Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'
...
* commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10':
avcodec options: add enum option for color_primaries
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 23:01:31 +02:00
3b42a8e439
avcodec/mpeg12enc: store sequence display extension only if we have something to store in it
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 22:54:22 +02:00
5163fb9446
Merge commit '8a06794112d02a5707f766b8b38a5d50dfd03898'
...
* commit '8a06794112d02a5707f766b8b38a5d50dfd03898':
mpeg2: add sequence display extension information
Conflicts:
libavcodec/mpeg12enc.c
tests/ref/lavf/gxf
tests/ref/lavf/mxf
tests/ref/lavf/mxf_d10
tests/ref/lavf/ts
tests/ref/seek/lavf-gxf
tests/ref/seek/lavf-mxf
tests/ref/seek/lavf-ts
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth1-mpeg2
tests/ref/vsynth/vsynth1-mpeg2-422
tests/ref/vsynth/vsynth1-mpeg2-idct-int
tests/ref/vsynth/vsynth1-mpeg2-ilace
tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth1-mpeg2-thread
tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 22:36:07 +02:00
7eb5b20a87
huffyuvdec: trick for plane decoding <= 14bits
...
Refactor the code to minimize code duplication.
Before:
130870 decicycles in g, 1048139 runs, 437 skips
10bits: 9.048
12bits: 10.733
After:
126960 decicycles in g, 1048136 runs, 440 skips
10bits: 8.642
12bits: 9.656
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 21:42:52 +02:00
c80181352c
lavf/matroskaenc: Fix Cues on Audio for WebM DASH
...
Fix a change that was broken by [1]. Cues must be added for audio frames
on cluster start for WebM when the DASH flag is passed. Restoring
correct functionality.
[1] http://goo.gl/xYLq7Z
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 21:36:11 +02:00
Michael Niedermayer
Ronald S. Bultje
Carl Eugen Hoyos
Paul B Mahol
Janne Grunau
James Almer
Rafaël Carré
Christophe Gisquet
Vignesh Venkatasubramanian