2cdedcbcea
Merge commit '75644335b907919057960716508477239c26fed4'
...
* commit '75644335b907919057960716508477239c26fed4':
lavc: Move start code finding to utils.c
Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 13:22:48 +01:00
795b911bd8
Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'
...
* commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f':
ape: 3.80-3.92 decoding support
h264: Remove an unused variable
Conflicts:
libavcodec/apedec.c
libavformat/ape.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 13:14:16 +01:00
9b9205e760
x86/dsputil.asm: make unaligned bswap actually work
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 13:07:46 +01:00
cb69a9dbf4
Merge commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb'
...
* commit 'e5c2794a7162e485eefd3133af5b98fd31386aeb':
x86: consistently use unaligned movs in the unaligned bswap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 13:07:37 +01:00
75644335b9
lavc: Move start code finding to utils.c
...
This allows dropping the mpegvideo dependency from a number of
components.
This also fixes standalone building of the h264 parser, which
was broken in 64e438697
2013-03-26 09:48:12 +02:00
ea7b96af96
avcodec/x86/dsputil_qns_template: use av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 04:08:28 +01:00
e32cbd0f54
lavfi/perms: add myself to the copyright header.
2013-03-26 02:41:05 +01:00
9371467d9d
lavfi/perms: add seed option.
2013-03-26 02:39:55 +01:00
e600d0628e
lavfi/perms: remove unecessary indirection after f7324c06.
2013-03-26 02:24:03 +01:00
bd03afb5bb
ffmpeg_opt: avoid strcpy()
...
This fixes a warning on openbsd and is more robust
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 01:51:19 +01:00
ec1ef0838c
tools: add audio normalize script example.
2013-03-26 01:50:13 +01:00
133035c40d
lavfi/curves: add forgotten strong_contrast preset.
2013-03-26 01:05:26 +01:00
183f3450fd
lavfi/curves: support preset shorthand.
2013-03-26 00:04:06 +01:00
dc65d784df
lavfi/curves: add presets support.
...
Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>
2013-03-25 23:48:51 +01:00
4a595cff79
ffserver/ctime1: avoid using strcpy()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 23:31:34 +01:00
ea4c99de4c
dshow_pin: dont return a value from a void function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 22:12:07 +01:00
a2f7314ba2
libpostproc: silence valgrind/fate warning about using uninitialized data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 21:48:45 +01:00
613a37eca4
ape: 3.80-3.92 decoding support
2013-03-25 18:40:56 +01:00
67607e20e8
xxan: make code independent of sizeof(AVFrame)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 17:35:58 +01:00
8097e5b212
yop: Fix return type
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 15:14:20 +01:00
ccd349e555
h264: Remove an unused variable
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-25 15:00:05 +02:00
afdfff485b
avcodec/gifdec: Add av_log() to workaround gcc 4.2 miscompiling the code
...
It appears gcc forgets to increment the byte stream pointer at -O3
I was not able to spot a reason/excuse for it to do that. It
also disappears if the function isnt inlined.
This should fix the gif fate failures on open & free bsd
See: [FFmpeg-devel] [PATCH] gifdec: workaround old gcc 4.2 mis-compiling code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 13:32:45 +01:00
ad438f450b
xan: make decoder independent of sizeof(AVFrame)
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 13:30:30 +01:00
45013b365e
lavc/flacdec: Propagate and return meaningful error codes
...
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 13:16:33 +01:00
f248b8a902
blend: Adding yuvj pixelformats to the blend effect
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 13:14:38 +01:00
4ce9e4e9c9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
sndio_dec: Add missing includes for av_gettime()
no change, as this has already been fixed in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 12:20:44 +01:00
e5c2794a71
x86: consistently use unaligned movs in the unaligned bswap
...
Fixes fate errors in asv1, ffvhuff and huffyuv on x86_32.
2013-03-25 12:11:11 +01:00
ae65327e5e
vsrc_testsrc: avoid floats and non bit exactness
...
The round to zero behavior is maintained, possibly this should
be changed to round to nearest.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 03:11:43 +01:00
01df2a13c3
avcodec/utils: initialize pixel buffer pool
...
This should silence many valgrind warnings about use of uninitialized
data, all the warnings i looked at where false positives having their
uninitialized data not actually used.
The same effect could be achieved by listing all code that touches
the pixel buffer in the valgrind suppression file.
Note, valgrind also fails to trace the origins correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-25 00:43:14 +01:00
4f112a8e34
lavf/mux: add the flush_packets option.
...
Note: a lot of muxers already do the flushing explicitly.
2013-03-24 23:19:07 +01:00
125acd2152
lavfi: support multiple rounds of format negotiation.
...
Remove the temporary hack for amerge and replace it with a
generic solution.
2013-03-24 23:17:47 +01:00
00da527b44
lavfi/af_amerge: return EAGAIN if the input layouts are not known.
...
Also downgrade the error to a warning.
2013-03-24 23:17:47 +01:00
57cb4fb075
lavfi: add test for concat.
2013-03-24 23:16:40 +01:00
e2b30194bb
h264/field_end move progress report code after error concealment.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-24 22:34:17 +01:00
386dc9a3a8
lavfi/thumbnail: add support for named options.
2013-03-24 20:38:12 +01:00
3b811bcf67
lavfi/colormatrix: reword error message in init
...
Change:
"source and destination color space are identical"
which is a true fact, but doesn't tell nothing about what's wrong, to:
"Source and destination color space must not be identical"
which tells more explicitly what the problem is.
2013-03-24 20:21:35 +01:00
1b140835b6
lavfi/colormatrix: add support for named options
2013-03-24 20:21:20 +01:00
cbf224b631
lavfi/tinterlace: use standard options parsing.
2013-03-24 12:26:25 +01:00
9e21c89841
lavfi/subtitles: use standard options parsing.
2013-03-24 12:26:25 +01:00
06784b737a
lavfi/smartblur: use standard options parsing.
2013-03-24 12:26:25 +01:00
15878b2b5b
lavfi/setfield: use standard options parsing.
2013-03-24 12:26:25 +01:00
e62587bc5e
lavfi/overlay: use standard options parsing.
2013-03-24 12:26:25 +01:00
5dc074d321
lavfi/kerndeint: use standard options parsing.
2013-03-24 12:26:25 +01:00
ab228f9163
lavfi/idet: use standard options parsing.
2013-03-24 12:26:25 +01:00
552c02f20f
lavfi/histeq: use standard options parsing.
2013-03-24 12:26:25 +01:00
b27a8ba13c
lavfi/gradfun: use standard options parsing.
2013-03-24 12:26:25 +01:00
b595819cde
lavfi/geq: use standard options parsing.
2013-03-24 12:26:24 +01:00
cb0fb4d04d
lavfi/fieldorder: use standard options parsing.
2013-03-24 12:26:24 +01:00
a733481d0a
lavfi/field: use standard options parsing.
2013-03-24 12:26:24 +01:00
7edda1a935
lavfi/deshake: use standard options parsing.
2013-03-24 12:26:24 +01:00
Michael Niedermayer
Martin Storsjö
Clément Bœsch
Kostya Shishkov
James Almer
Björn S
Janne Grunau
Nicolas George
Stefano Sabatini