33620e243f
lavfi/vignette: add some scaling debug.
2013-05-30 20:41:56 +02:00
bfafcc4ebe
lavfi/vignette: simplify dmax definition.
2013-05-30 20:41:37 +02:00
cf6f179044
lavfi/vignette: fix scale with aspects smaller than one.
2013-05-30 20:40:39 +02:00
826b3a75cd
h264_cavlc: fix reading skip run
...
Fixes Ticket2606
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 18:38:04 +02:00
3f714d1ffd
jpeg2000/j2k: merge non functional changes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 18:38:04 +02:00
941a8efae2
j2k:decode_tile() pass picture as argument
...
Reduce diff to jpeg2000dec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 18:38:04 +02:00
9ccc9f30f7
jpeg2000: drop red-blue swap
...
This should no longer be needed as the pix fmt was updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 18:37:56 +02:00
7836583934
j2kdec: s/j2k_/jpeg2000_/
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 18:31:25 +02:00
4a85390d29
lavfi/vignette: make sure a sane sar is set.
2013-05-30 18:13:04 +02:00
0ab9362fcb
lavfi: add vignette filter.
2013-05-30 17:52:52 +02:00
310f9dd698
j2k/jpeg2000: merge pix_fmt setting code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 16:45:30 +02:00
6f7de3d5c8
mpegvideo_enc: allow mpeg_quant to be set in mpeg2video
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 16:07:07 +02:00
62d00aa22f
jpeg2000/j2k: merge j2k/jpeg2000.c/h
...
Now only j2kdec / jpeg2000dec.c remain
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 14:57:58 +02:00
c2ac389bba
jpeg2000: remove unneeded casts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 14:43:09 +02:00
09e03a8467
jpeg2000: merges quantization fixes from j2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 14:43:09 +02:00
efc2df2e27
jpeg2000: remove unneeded variable initialization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 14:43:09 +02:00
84a6bc2357
jpeg2000: tag_tree_size: replace check by assert
...
This function is never called with values large enough for the
error condition to occur
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 14:43:09 +02:00
8bedbb82ce
j2k/jpeg2000: split data pointer in int & float.
...
This fixes a TODO item and unifies both decoders structures
It also fixes undefined behavior due to aliasing violations
I choose 2 fields instead of a union because mistakely using the
wrong type with a union will lead to hard to debug "wrong output"
while with 2 fields mistakely using the wrong type will crash
with a null pointer derefernce which is much easier to debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 14:18:53 +02:00
b3af9242d0
Use -lX11 -lXext when linking Xv output device.
...
Reviewed-by: Stefano Sabatini
2013-05-30 13:13:57 +02:00
1a7ae6be2a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
arm: Include hpeldsp_neon.o if h264qpel is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 11:21:45 +02:00
e119d1b345
Merge commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74'
...
* commit 'efb7968cfe8b285ab4f27b363719b7c92d19ec74':
arm: Don't unconditionally build dsputil files
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 11:02:21 +02:00
0b539da4c7
Merge commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304'
...
* commit '36a7df8cf1115aa37a1b0d42324ecde5ab6c2304':
arm: Only build the FFT init files if FFT is enabled
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 10:57:14 +02:00
3a0e21f037
Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'
...
* commit '186599ffe0a94d587434e5e46e190e038357ed99':
build: cosmetics: Place unconditional before conditional OBJS lines
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 10:49:43 +02:00
f7a267affe
doc/encoders: remove duplicated "the"
2013-05-30 10:44:54 +02:00
9f8937b5ef
lavd: add xv output device
...
Based on the work of Jeff Moguillansky <Jeff.Moguillansky@am.sony.com >.
See thread:
Subject: [FFmpeg-devel] x11 output device for libavdevice
Date: Wed, 10 Apr 2013 23:10:47 +0000
2013-05-30 10:44:54 +02:00
1bbbbb0a32
Merge commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa'
...
* commit '9b9b2e9f3036abfd42916bcf734af14b4cb686aa':
build: arm: cosmetics: Place all OBJS declarations in alphabetical order
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 10:37:52 +02:00
103ffde5a3
Merge commit '701966730ce10290fd49c5ccedd73f505680f764'
...
* commit '701966730ce10290fd49c5ccedd73f505680f764':
vmd: drop incomplete chunks and spurious samples
Conflicts:
libavcodec/vmdav.c
2 of the changes are replaced by assert0s, as they should
be impossible.
The actual bug is likely caused by a invalid block_align
which is checked for and thus impossible in ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 10:36:52 +02:00
ab78e21ea2
Merge commit '676da248cad49debc40720baa13214f0b94dcc71'
...
* commit '676da248cad49debc40720baa13214f0b94dcc71':
vmd: refactor the inner decode loop
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 09:44:57 +02:00
8ef89833d0
Merge commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9'
...
* commit 'c8f3cb9119c2183680d44a509a1b5a9817a3bee9':
vmd: return meaningful errors
Conflicts:
libavcodec/vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 09:37:14 +02:00
6635b13411
Merge commit '91a6944e56236234f0a7ba162404665753cbcb51'
...
* commit '91a6944e56236234f0a7ba162404665753cbcb51':
vmd: use the PALETTE_COUNT constant uniformly
Conflicts:
libavcodec/vmdav.c
No change as the changed line does not exist in ffmpegs vmdav.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 09:28:23 +02:00
63e5e9f7c5
fate: fix smvjpeg test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 03:31:04 +02:00
455ae871a8
libavcodec/smvjpegdec: pass flags / idct algo into jpeg avctx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 03:30:01 +02:00
fa30f4c24d
fate: add smv test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 03:00:05 +02:00
86113667c0
arm: Include hpeldsp_neon.o if h264qpel is enabled
...
A few of the h264qpel neon functions are shared with other
hpeldsp functions in this file.
This fixes standalone compilation of the h264 decoder on arm.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-05-30 02:17:37 +03:00
efb7968cfe
arm: Don't unconditionally build dsputil files
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-05-30 02:17:35 +03:00
36a7df8cf1
arm: Only build the FFT init files if FFT is enabled
...
This fixes build errors in cases where FFT is disabled.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-05-30 02:17:33 +03:00
186599ffe0
build: cosmetics: Place unconditional before conditional OBJS lines
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-05-30 02:17:31 +03:00
9b9b2e9f30
build: arm: cosmetics: Place all OBJS declarations in alphabetical order
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-05-30 02:17:27 +03:00
29e97cd6c3
avformat/mov: Try to detect and support files with invalid sample sizes
...
Fixes Ticket2605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-30 00:32:36 +02:00
4c2b3f4738
Add AV_HASH_MAX_SIZE.
...
Makes it easier to use static allocation for the result buffer.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2013-05-29 22:31:16 +02:00
dccaad3bcd
wamenc: handle failure to encode.
...
This is necessary since the switch to floating point
input means there is no longer sufficient input data
validation.
There is a good chance that other encoders are affected
by similar issues.
This problem can be triggered by trying to encode
extremely large values and probably also with Inf and
possibly also NaNs.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2013-05-29 22:31:16 +02:00
701966730c
vmd: drop incomplete chunks and spurious samples
...
Odd chunk size makes no sense for stereo and incomplete chunks are
not supported.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-05-29 21:30:21 +02:00
38fefbc474
wtvenc: use ffio_fill()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-29 18:14:43 +00:00
ac025d6eca
j2kdec: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-29 19:57:03 +02:00
0abe923d20
mpegvideo: fix forgotten lowres op_index limits
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-29 19:55:27 +02:00
c2625c26c5
mpegvideo: implement ff_put_h264_chroma_mc1 & ff_avg_h264_chroma_mc2
...
These are needed for lowres 3
This may fix Ticket2538
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-29 19:48:03 +02:00
f8f42f4821
lavfi/noise: fix out of array access
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-29 16:54:28 +00:00
83f9735592
lavfi/noise: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-29 16:13:11 +00:00
f46732fe4d
wvenc: remove flush call, not needed since 4f112a8e3
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-29 14:25:34 +00:00
6d3b913479
remove APEv1 tag writer
...
Not used anymore.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-05-29 14:06:26 +00:00
