Michael Niedermayer
47ec0b0b0f
avutil/internal: add FF_ALLOC_ARRAY_OR_GOTO & FF_ALLOCZ_ARRAY_OR_GOTO
...
These are similar to the existing FF_ALLOCZ_OR_GOTO & FF_ALLOC_OR_GOTO
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-22 02:09:55 +02:00
Michael Niedermayer
5e5aced585
Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'
...
* commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8':
mpegvideo: Use the current_picture pts
See: c354576457michaelni@gmx.at >
2014-04-21 23:57:07 +02:00
Michael Niedermayer
60fdf7dd9e
Merge commit '6f243b17c537646b894857d43dfdac65f85ab377'
...
* commit '6f243b17c537646b894857d43dfdac65f85ab377':
avcodec/fic: Fix return value check
See: 230db1426dmichaelni@gmx.at >
2014-04-21 23:54:09 +02:00
Michael Niedermayer
e0cdc68bdc
Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'
...
* commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9':
avcodec/fic: clear slice_data
See: 1db8bc5648michaelni@gmx.at >
2014-04-21 23:52:46 +02:00
Michael Niedermayer
359a719f5f
Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'
...
* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575':
avcodec/fic: fix slice checks
See: d46ef40129michaelni@gmx.at >
2014-04-21 23:42:37 +02:00
Michael Niedermayer and Luca Barbato
1c7b71a5bd
mpegvideo: Use the current_picture pts
...
The picture slot can be recycled by select_input_picture and
only current_picture is populated with the valid pts.
Unbreak timestamps when in cbr mode.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2014-04-21 21:58:58 +02:00
Michael Niedermayer and Derek Buitenhuis
6f243b17c5
avcodec/fic: Fix return value check
...
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2014-04-21 14:56:17 -04:00
Michael Niedermayer and Derek Buitenhuis
144f7a561d
avcodec/fic: clear slice_data
...
Fixes artifacts
Fixes use of freed memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2014-04-21 14:56:17 -04:00
Michael Niedermayer and Derek Buitenhuis
f34d3173fc
avcodec/fic: fix slice checks
...
fix integer overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2014-04-21 14:56:17 -04:00
Michael Niedermayer
451c78740a
Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'
...
* commit '93e15a323871613fd26f1f1e317029a50b5b24ca':
fic: use correct IDCT
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-21 20:20:39 +02:00
Kostya Shishkov and Derek Buitenhuis
93e15a3238
fic: use correct IDCT
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2014-04-21 12:37:54 -04:00
Michael Niedermayer
59c7615d58
avfilter/filtfmts: Support dynamically allocated in/outputs
...
Fixes crash
Fixes Ticket3468
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-21 11:33:17 +02:00
Michael Niedermayer
f3743901d7
avformat: Fix decoder search in find stream info
...
Fixes Ticket3548
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-21 05:27:08 +02:00
Michael Niedermayer
369cdf917a
avformat/asfenc: dont allow non interleaved packets
...
The muxer does not support this currently
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-21 02:49:05 +02:00
Michael Niedermayer
5b19fc7aae
avformat/pmpdec: remove cur_dts timestamp hack
...
It appears the demuxer works fine without it
Fixes Ticket3534
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-21 01:29:08 +02:00
Clément Bœsch
62d31307c1
avcodec/x86/vp9lpf: add a comment above a bunch of SWAP.
2014-04-20 21:33:58 +02:00
Clément Bœsch
f0d368d758
avcodec/x86/vp9lpf: merge a few movs with other instructions.
2014-04-20 21:29:11 +02:00
Lukasz Marek and Michael Niedermayer
4d09bc9897
lavf/pcm: remove redundant check
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 20:56:02 +02:00
Michael Niedermayer
af89a685c4
avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1
...
The original patch seems to be missing a 16x16 function though
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 20:32:21 +02:00
Christophe Gisquet and Michael Niedermayer
319235c67c
vc1dsp: introduce cases for 8x8 and 16x16
...
This allows further unrolling the DSP implementation where possible.
x86 and ARM DSP modified by simply moving the multiple calls from vc1dec
to the DSP code. Decoding improvements should only occurs because of the
compiler actually able to unroll more.
Decoding time: ~8.80s -> 8.64s (ie around 2%)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 18:25:36 +02:00
Michael Niedermayer
de9cd58848
avcdoec/webp: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 17:35:19 +02:00
Michael Niedermayer
8c88ea76df
avcodec/tiff: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 17:32:17 +02:00
Michael Niedermayer
1fd5c7f1ee
avcodec/ratecontrol: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 17:30:15 +02:00
Michael Niedermayer
69bbe27b45
avcodec/huffman: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 17:25:01 +02:00
Michael Niedermayer
e70b9b32d5
avcodec/exif: do not follow 0 offsets
...
Fixes exif decoding failure of 1295328_300.jpg
Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 17:02:16 +02:00
Michael Niedermayer
a94de50ba0
avcodec/exif/exif_add_metadata: add support for SSHORT & SBYTE
...
No working testcase, this omission was just spoted when the parser apparently went out of
sync.
Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 17:01:46 +02:00
Michael Niedermayer
cd4faed893
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd/xv: implement repaint message
lavd/xv: add window id param
lavd/xv: keep aspect ratio
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 05:43:26 +02:00
Peter Ross and Michael Niedermayer
f57ac37228
avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks
...
Signed-off-by: Peter Ross <pross@xvid.org >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-20 00:22:20 +02:00
Michael Niedermayer
373d7dd371
Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'
...
* commit '911fa05b514e1be009e00b79d7004b93717c023b':
mvc: Specify the pixel format for the mv-mvc* tests
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 22:43:16 +02:00
Martin Storsjö
911fa05b51
mvc: Specify the pixel format for the mv-mvc* tests
...
Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.
This fixes the tests on big endian.
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-04-19 21:41:34 +03:00
Michael Niedermayer
75ef907db8
Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'
...
* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
fate: add tests for SGI RLE and MVC1&2 decoders
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 20:40:02 +02:00
Michael Niedermayer
01a39a978c
Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'
...
* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
Silicon Graphics Movie demuxer
Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h
See: 6fb40779cdmichaelni@gmx.at >
2014-04-19 20:17:33 +02:00
Michael Niedermayer
0c67ef2729
Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'
...
* commit '86a0432688216562926d4aee36118f01be6d5e1b':
Silicon Graphics Motion Video Compressor 1 & 2 decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h
See: 746b1dcc98michaelni@gmx.at >
2014-04-19 19:47:58 +02:00
Michael Niedermayer
e37dbfddda
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
...
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
Silicon Graphics RLE 8-bit video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h
See: afa1617b93michaelni@gmx.at >
2014-04-19 19:26:46 +02:00
Michael Niedermayer
928b5708f9
Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
...
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
h264: codec reinit: remove statements without effect
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 18:50:32 +02:00
Michael Niedermayer
c1bc20bfd9
Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'
...
* commit '6ef96292d99302a59f824713fc763f6abd3754df':
utils: add yvyu422 to avcodec_align_dimensions2
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 18:38:39 +02:00
Michael Niedermayer
6ca0a976b2
Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'
...
* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
filtfmts: remove unused lavf include
A include for channel_layout.h, is added otherwise compile would break
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 18:30:37 +02:00
Michael Niedermayer
74a8dbe1c4
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
...
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
lavfi: name anonymous structs
Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 18:20:17 +02:00
Clément Bœsch
010732b73a
vp9/x86: simplify FILTER_INIT.
...
In the 2 FILTER_INIT usages, the source is already preloaded so that
extra complexity taken from FILTER_UPDATE is not necessary.
Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.
2014-04-19 17:30:33 +02:00
Clément Bœsch
b8d002dc95
vp9/x86: clarify mixed splatb.
2014-04-19 17:00:51 +02:00
Vittorio Giovara
6dfd99c938
fate: add tests for SGI RLE and MVC1&2 decoders
2014-04-19 16:24:27 +02:00
Peter Ross and Vittorio Giovara
55ddd700c6
Silicon Graphics Movie demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2014-04-19 16:24:27 +02:00
Peter Ross and Vittorio Giovara
86a0432688
Silicon Graphics Motion Video Compressor 1 & 2 decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2014-04-19 16:24:26 +02:00
Peter Ross and Vittorio Giovara
07761294fc
Silicon Graphics RLE 8-bit video decoder
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2014-04-19 16:24:26 +02:00
Janne Grunau and Vittorio Giovara
34c5a6660a
h264: codec reinit: remove statements without effect
...
avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.
2014-04-19 16:22:06 +02:00
Vittorio Giovara
6ef96292d9
utils: add yvyu422 to avcodec_align_dimensions2
2014-04-19 16:20:58 +02:00
Vittorio Giovara
d23fc8846d
filtfmts: remove unused lavf include
2014-04-19 16:20:57 +02:00
Vittorio Giovara
58400ac133
lavfi: name anonymous structs
2014-04-19 16:20:57 +02:00
James Almer and Michael Niedermayer
3b06208a57
x86/float_dsp: remove duplicated code from vector_dmul_scalar
...
Use the xm# and ym# aliases as they remain in sync with m# after a SWAP.
No actual changes to the assembly.
Signed-off-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 14:21:51 +02:00
Michael Niedermayer
c91a798a2c
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Fix compilation with !HAVE_6REGS.
Use MANGLE in cavsdsp.c to save two registers using gcc.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-04-19 14:17:51 +02:00
