Michael Niedermayer
fe6a36e768
Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'
...
* commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9':
lavc: do not leak frames in avcodec_decode_audio4
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 13:25:19 +02:00
Michael Niedermayer
e077ba8016
Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'
...
* commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8':
indeo3: use unaligned reads on reference blocks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 11:54:29 +02:00
Michael Niedermayer
1bad40ef27
Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'
...
* commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c':
jpeg2000dec: initialize static data just once
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 11:46:41 +02:00
Michael Niedermayer
aecb3421f6
Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'
...
* commit '45a1694fde251ee56e23aec073d73172c00aa470':
jpeg2000dec: cleanup properly after decoding errors
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 11:41:54 +02:00
Christophe Gisquet
fc37cd4333
x86: sbrdsp: force PIC addressing for Win64
...
MSVC complains about the 32bits addressing, while mingw/gcc does not.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 03:07:03 +02:00
Michael Niedermayer
c67bca2b5a
avcodec/mpegvideo: Fix edge emu with lowres
...
Fixes a few green artifacts at the top
Fixes rest of Ticket 2535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 01:18:56 +02:00
Michael Niedermayer
bca50e5cd5
avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks
...
Fixes green trash
Fixes part of Ticket2535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 01:17:45 +02:00
Diego Biurrun
ed880050ed
x86: dsputil: Group all assembly constants together in constants.c
2013-05-08 01:04:04 +02:00
Diego Biurrun
8761466760
x86: dsputil: Move ff_pd assembly constants to the only place they are used
2013-05-08 01:04:04 +02:00
Michael Niedermayer
9dd04f6d8c
sanm: Check dimensions before use
...
Fixes integer overflow and out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 21:59:05 +02:00
Michael Niedermayer
ad002e1a13
avcodec/cdgraphics: check buffer size before use
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 21:06:48 +02:00
Michael Niedermayer
ead590c256
dxa: check vectors of 2x2 motion blocks
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 20:33:46 +02:00
Michael Niedermayer
f96e0eb238
dxa: check vectors of 4x4 motion blocks
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 20:20:14 +02:00
Michael Niedermayer
89d998f1c1
shorten: allocate space for padding
...
Fixes array overread
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 20:05:53 +02:00
Diego Biurrun
1b343cedd7
x86: dsputil: Remove unused ff_pb_3F constant
2013-05-07 18:03:35 +02:00
Diego Biurrun
63bac48f73
x86: dsputil: Move rv40-specific functions where they belong
2013-05-07 18:03:35 +02:00
Diego Biurrun
3334cbec0a
x86: dsputil: Remove unused MOVQ_BONE macro
2013-05-07 18:03:35 +02:00
Diego Biurrun
92f8e06ecb
x86: dsputil hpeldsp: Move shared template functions into separate object
2013-05-07 18:03:34 +02:00
Diego Biurrun
7edaf4edb5
x86: rnd_template: Eliminate pointless OP_AVG macro indirection
2013-05-07 18:03:34 +02:00
Michael Niedermayer
d23b8462b5
gifdec: reset previous Graphic Control Extension disposal type
...
This fixes out of array accesses.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 17:03:34 +02:00
Luca Barbato
e55e8b2c36
lavc: do not leak frames in avcodec_decode_audio4
...
Notwithstanding the return value the frame should be freed if
is not going to be used.
Reported-by: Matthew Wolenetz <wolenetz@chromium.org>
2013-05-07 14:37:32 +02:00
Michael Niedermayer
144baf427a
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 14:21:49 +02:00
Gunther Piez
acc4a7e5b3
Ticket #2540 Enable threading when using -c:v libx264rgb
...
Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 13:38:15 +02:00
Anton Khirnov
a97d8cc16e
indeo3: use unaligned reads on reference blocks.
...
They are not guaranteed to be aligned.
Fixes Bug 503.
CC:libav-stable@libav.org
2013-05-07 12:29:56 +02:00
Carl Eugen Hoyos
f381dc1d61
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.
...
Fixes bug 459.
2013-05-07 11:46:35 +02:00
Matt Wolenetz
004779cc59
avcodec/utils: Fix leak by dereferencing audio frame when side data causes whole frame skip
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07 01:33:08 +02:00
Michael Niedermayer
974420a701
jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()
...
Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 22:56:22 +02:00
Janne Grunau
70f9661542
jpeg2000dec: initialize static data just once
2013-05-06 22:45:47 +02:00
Janne Grunau
45a1694fde
jpeg2000dec: cleanup properly after decoding errors
...
Fixes memory leak in fate-redcode-demux.
2013-05-06 22:27:33 +02:00
Carl Eugen Hoyos
905e1e4b52
Cosmetics: Fix indentation and add braces after last commit.
2013-05-06 21:55:14 +02:00
Carl Eugen Hoyos
8b8fa09b65
vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.
...
Fixes mplayer -vc ffvc1vdpau for interlaced streams.
2013-05-06 21:55:14 +02:00
Rainer Hochecker
06d8fdb660
Fix vdpau vc1 interlace modes also when using decoder vc1_vdpau.
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-05-06 21:55:14 +02:00
Michael Niedermayer
050b48f397
Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'
...
* commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50':
swscale: Remove unnecessary backslashes
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:23:29 +02:00
Nicolas Bertrand
a06f0cef5b
jpeg2000: fix for uninitialized data errors in valgrind/memcheck
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:14:19 +02:00
Michael Niedermayer
108e2ae829
Merge commit '110796739ab32854dc0b6b0a1c95e6ae98889062'
...
* commit '110796739ab32854dc0b6b0a1c95e6ae98889062':
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 21:00:40 +02:00
Michael Niedermayer
a6e782434a
Merge commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c'
...
* commit 'dc1b328d0df6e5ad5ff0ca4ae031e08466624f9c':
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 20:53:37 +02:00
Michael Niedermayer
32cc7dacde
Merge commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e'
...
* commit '9e5e76ef9ea803432ef2782a3f528c3f5bab621e':
x86: More specific ifdefs for dsputil/hpeldsp init functions
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 20:46:27 +02:00
Michael Niedermayer
8cdf95d9b8
snow: add av_cold where appropriate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:58:17 +02:00
Michael Niedermayer
d2bf8aecd3
j2kdec: frame multithreading support
...
This allows comparing the 2 decoders with threads
Based on:commit 2e2d24667a
By: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 16:38:03 +02:00
Nicolas Bertrand
28816f9db8
jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-06 13:07:00 +02:00
Carl Eugen Hoyos
76f43cbe26
Remove a superfluous include from libavcodec/options_table.h.
2013-05-06 12:16:50 +02:00
Diego Biurrun
110796739a
x86: hpeldsp: Move avg_pixels8_x2_mmx() out of hpeldsp_rnd_template.c
...
The function is only instantiated once, so there is no point
in keeping it in a template file.
2013-05-06 11:02:08 +02:00
Diego Biurrun
dc1b328d0d
x86: hpeldsp: Only compile MMX hpeldsp code if MMX is enabled
2013-05-06 11:02:08 +02:00
Diego Biurrun
9e5e76ef9e
x86: More specific ifdefs for dsputil/hpeldsp init functions
2013-05-06 11:02:07 +02:00
Michael Niedermayer
77c85cbd9d
Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'
...
* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
nut: use a define for the nut version
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:41:43 +02:00
Michael Niedermayer
b50ab3a4c7
Merge commit 'bd8ac882140a38868c33c000a430a1292a352533'
...
* commit 'bd8ac882140a38868c33c000a430a1292a352533':
avcodec: Add av_cold attributes to end functions missing them
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 10:28:27 +02:00
Michael Niedermayer
5a9e376049
h264: check mb_width/height
...
Fixes inconsistency that leads to out of array accesses with threads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 01:58:10 +02:00
Michael Niedermayer
edabbfbaf2
ff_h264_decode_seq_parameter_set: dont set h->sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:37:47 +02:00
Michael Niedermayer
26482ae716
h264_sei/decode_picture_timing: do not depend on h->sps being set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:35:25 +02:00
Michael Niedermayer
ccdaa31d86
ff_h264_decode_picture_parameter_set: fix return code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:47 +02:00
Michael Niedermayer
dc35b77b28
ff_h264_decode_picture_parameter_set: use the correct sps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-06 00:01:05 +02:00
Diego Biurrun
2d5fd7886a
bgmc: Do not mark ff_bgmc_decode_init() as av_cold
...
The function is possibly called once per block.
2013-05-05 20:51:52 +02:00
Diego Biurrun
bd8ac88214
avcodec: Add av_cold attributes to end functions missing them
2013-05-05 20:51:28 +02:00
Carl Eugen Hoyos
a07ac1f788
Fix type of shared flac table ff_flac_blocksize_table[].
...
Fixes ticket #2533 .
2013-05-05 19:29:00 +02:00
Rainer Hochecker
fe1f36547d
register AV_PIX_FMT_VDPAU for hwaccel
2013-05-05 16:15:41 +02:00
Rainer Hochecker
b37cc5995b
fix vdpau vc1 interlace modes
2013-05-05 15:12:59 +02:00
Michael Niedermayer
cdfa1c89b7
avcodec: Set frame.width/height on all exit pathes of ff_get_buffer()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 14:23:16 +02:00
Michael Niedermayer
a1f234be11
make the ordering of the return type and av_cold consistent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 13:13:00 +02:00
Michael Niedermayer
0aa095483d
Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'
...
* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
avcodec: Add av_cold attributes to init functions missing them
Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 11:34:29 +02:00
Reimar Döffinger
d82729e5d9
Detect and skip mj2-style jp2c header.
...
This this fixes one of the issues with
http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip
and at least allows to demux the file properly instead
of failing during probing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05 10:01:22 +02:00
Claudio Freire
1ef82cc60d
AAC encoder: Fix rate control on twoloop.
...
Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 04:19:34 +02:00
Claudio Freire
c545876d1b
AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 01:24:57 +02:00
Michael Niedermayer
369a120826
xbmdec: fix off by one error in scanf()
...
Fixes out of array access
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 00:27:18 +02:00
Diego Biurrun
6fee1b90ce
avcodec: Add av_cold attributes to init functions missing them
2013-05-04 21:09:45 +02:00
Michael Niedermayer
c40f51e15b
h264: Always decode MMCOs into temprary array
...
When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 20:23:05 +02:00
Michael Niedermayer
c7a7605656
wmaprodec: Fix null pointer dereference in decode_frame()
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 16:51:01 +02:00
Michael Niedermayer
e9e207ece7
dfa: Put our pointer check back.
...
The reimplementation by Libav does not prevent out of array
writes, even though it looks like it does at a quick glance.
No FFmpeg releases are affected by this
See: d1c95d2ce3
3623589edc
740ebe468c
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 14:42:19 +02:00
Hendrik Leppkes
d18341fb11
aacdec: free frame buffer if no audio was decoded
...
If no decoding error was detected, but still no audio was decoded, the
frame needs to be free'ed, or it will leak.
Fixes part of ticket #2095
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 13:20:19 +02:00
Michael Niedermayer
0104570fb6
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
...
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 10:17:52 +02:00
Michael Niedermayer
711c8ee71d
Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'
...
* commit '4a7af92cc80ced8498626401ed21f25ffe6740c8':
sbrdsp: Unroll and use integer operations
sbrdsp: Unroll sbr_autocorrelate_c
x86: sbrdsp: Implement SSE2 qmf_deint_bfly
Conflicts:
libavcodec/sbrdsp.c
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 10:07:43 +02:00
Michael Niedermayer
f18d2dff11
evrcdec: fix sign error
...
The specification wants round(abs(x))) * sign(x) which is
equivakent to round(x)
Fixes out of array access
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 02:50:30 +02:00
Michael Niedermayer
64819bfc7a
snow: Fix off by 1 error in reference picture management
...
Fixes out of array accesses
No release is affected by this bug
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 01:19:48 +02:00
Michael Niedermayer
e756635964
eamad: Check against minimum supported dimensions
...
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 23:17:37 +02:00
Diego Biurrun
a5f8873620
silly typo fixes
2013-05-03 18:26:12 +02:00
Christophe Gisquet
4a7af92cc8
sbrdsp: Unroll and use integer operations
...
This patch can be controversial, by assuming floats are IEEE-754 and
particular behaviour of the FPU will get in the way.
Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference).
sbr_qmf_pre_shuffle_c: 115 to 76
sbr_neg_odd_64_c: 84 to 55
sbr_qmf_post_shuffle_c: 112 to 83
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-03 18:23:30 +02:00
Christophe Gisquet
8394d9a676
sbrdsp: Unroll sbr_autocorrelate_c
...
1410 cycles to 1148 on Arrandale/Win64
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-03 18:23:30 +02:00
Christophe Gisquet
5a97469a4f
x86: sbrdsp: Implement SSE2 qmf_deint_bfly
...
Sandybridge: 47 cycles
Having a loop counter is a 7 cycle gain.
Unrolling is another 7 cycle gain.
Working in reverse scan is another 6 cycles.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-05-03 18:23:14 +02:00
Michael Niedermayer
d29f9f4a0e
vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 18:09:15 +02:00
Michael Niedermayer
7e30bfcb91
vc1dec: Fix mixed field/frame intensity compensation
...
Fixes Ticket2523
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 18:04:48 +02:00
Michael Niedermayer
90c2e40ebb
vc1dec: vc1_mc_4mv_chroma4: match addressing between compensation and MC
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 18:04:48 +02:00
Michael Niedermayer
9fd5e75bdf
Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'
...
* commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a':
vc1_parser: Set field_order.
mpegvideo_parser: Set field_order.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 13:03:00 +02:00
Michael Niedermayer
6fc58a8cb6
Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'
...
* commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5':
avcodec: Add field order information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 12:15:01 +02:00
Michael Niedermayer
2ee29b5fb9
avcodec: move lowres down with the next ABI bump and add accessors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 11:32:04 +02:00
Michael Niedermayer
88ef7f6d2b
Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'
...
* commit '803d21f38bdafe7c4e2571a9ae7052013a12923b':
lavc: schedule AVCodecContext.lowres for removal on next bump.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 11:30:00 +02:00
Michael Niedermayer
1ba4cbf734
Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'
...
* commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec':
aac: Remove aacpsy.h header, unused since 78e65cd772
cavs: Remove cavsdata.h header, unused since 88386feefd
Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:55:43 +02:00
Michael Niedermayer
05599308e9
Merge commit 'bf7c3c6b157f7938578f964b62cffd5e504940be'
...
* commit 'bf7c3c6b157f7938578f964b62cffd5e504940be':
x86: dsputil: Move cavs and vc1-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:50:27 +02:00
Michael Niedermayer
35ef98013d
Merge commit '932806232108872655556100011fe369125805d3'
...
* commit '932806232108872655556100011fe369125805d3':
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:44:09 +02:00
Michael Niedermayer
ed1697ffcb
Merge commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd'
...
* commit '9b3a04d30691e85b77e63f75f5f26a93c3a000cd':
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 10:36:52 +02:00
Masaki Tanaka
accde1bd87
vc1_parser: Set field_order.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-03 08:20:19 +02:00
Masaki Tanaka
f43c14d046
mpegvideo_parser: Set field_order.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-03 08:20:11 +02:00
Masaki Tanaka
507b1e454c
avcodec: Add field order information to AVCodecParserContext.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-03 08:16:10 +02:00
Anton Khirnov
803d21f38b
lavc: schedule AVCodecContext.lowres for removal on next bump.
...
It has been deprecated some time ago, but was forgotten during the last
bump.
2013-05-03 08:07:35 +02:00
Michael Niedermayer
ae2132ac90
mmvideo/mm_decode_intra: check horizontal coordinate too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 22:12:19 +02:00
Michael Niedermayer
8d3c99e825
mmvideo/mm_decode_inter: check horizontal coordinate too
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 22:05:19 +02:00
Diego Biurrun
6b753015ca
aac: Remove aacpsy.h header, unused since 78e65cd772
2013-05-02 18:16:06 +02:00
Diego Biurrun
153f31b1af
cavs: Remove cavsdata.h header, unused since 88386feefd
2013-05-02 18:15:37 +02:00
Michael Niedermayer
60ab448042
ape_decode_value_3860: check k before using it in get_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 17:24:02 +02:00
Michael Niedermayer
8937230719
ape_decode_value_3900: check tmpk
...
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 16:45:32 +02:00
Paul B Mahol
663794f63d
vmdav: unbreak decoding of samples from game The Last Dynasty
...
This fixes video output with samples HG060808.VMD and
HG060810.VMD. Regression since c0cbe36b18
.
While here show warning if decoding is aborted for some reason.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 11:37:59 +00:00
Paul B Mahol
cdada4f639
vmdav: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-02 11:34:14 +00:00
Michael Niedermayer
4d4ec18b21
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Add wmv2 dependency to vc1 compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 13:02:09 +02:00
Michael Niedermayer
0beff42823
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
id3v2: K&R formatting cosmetics
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 12:49:23 +02:00
Diego Biurrun
bf7c3c6b15
x86: dsputil: Move cavs and vc1-specific functions where they belong
2013-05-02 11:45:37 +02:00
Diego Biurrun
9328062321
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
...
The function does not do any rounding, so there is no point in
keeping it in a round template file.
2013-05-02 11:45:37 +02:00
Diego Biurrun
9c112a6158
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
...
The function is only instantiated once, so there is no point
in keeping it in a template file.
2013-05-02 11:45:37 +02:00
Diego Biurrun
9b3a04d306
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
2013-05-02 11:16:45 +02:00
Carl Eugen Hoyos
d0a661d48a
Add wmv2 dependency to vc1 compilation.
...
Fixes compilation with --disable-everything --enable-decoder=vc1.
2013-05-02 11:04:57 +02:00
Diego Biurrun
a650c906cb
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
2013-05-02 10:25:30 +02:00
Michael Niedermayer
6021615bbe
avcodec/ansi: Fix right/bottom end checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 02:16:41 +02:00
Michael Niedermayer
e91fd754c6
avcodec/ansi: Check x/y
...
This prevents out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-02 02:15:40 +02:00
Michael Niedermayer
c1f2c4c3b4
vmdav: Try to fix unpack_rle()
...
This fixes out of array accesses
The code prior to this commit could not have worked, thus obviously
was untested. I was also not able to find a valid sample that uses this
code.
This fix is thus only based on the description of the format
If someone has a sample that uses unpack_rle(), please mail me.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 23:51:05 +02:00
Michael Niedermayer
d602f16a37
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavc: copy subtitle_header when copying context.
lavf: data muxer and demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 20:16:26 +02:00
Michael Niedermayer
67731ef40f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avutil: doxy: Small clarification for av_buffer_create()
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Conflicts:
libavutil/buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:33:30 +02:00
Michael Niedermayer
dbcf7e9ef7
Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'
...
* commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d':
ppc: Drop unnecessary ff_ name prefixes from static functions
x86: Drop unnecessary ff_ name prefixes from static functions
arm: Drop unnecessary ff_ name prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:21:35 +02:00
Michael Niedermayer
04fa818779
Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284'
...
* commit '088f38a4f9f54bb923405c67c9e72d96d90aa284':
avcodec: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavcodec/ass.c
libavcodec/h264_parser.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:16:32 +02:00
Michael Niedermayer
cae8f469fe
Merge commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f'
...
* commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f':
ppc: More consistent arch initialization
Conflicts:
libavcodec/fft.h
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:08:13 +02:00
Michael Niedermayer
ebd99ff112
Merge commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf'
...
* commit '42b9150b0d4f0a130c1d93dc991fd5412743a8cf':
fft: Remove pointless #ifdefs around function declarations
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Conflicts:
libavcodec/fft.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 18:02:36 +02:00
Michael Niedermayer
3ad5d8694c
Merge commit '6b110d3a739c31602b59887ad65c67025df3f49d'
...
* commit '6b110d3a739c31602b59887ad65c67025df3f49d':
ppc: More consistent names for H.264 optimizations files
mpegaudiosp: More consistent names for ppc/x86 optimization files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 17:53:33 +02:00
Nicolas George
ceb33f3aee
lavc: copy subtitle_header when copying context.
...
Fix trac ticket #2489 .
2013-05-01 11:56:34 +02:00
Michael Niedermayer
52fa2945b5
Merge commit 'e036bb7899d0faca9159206be9bf5552e76e7633'
...
* commit 'e036bb7899d0faca9159206be9bf5552e76e7633':
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
FATE: add an additional indeo3 test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:00:08 +02:00
Michael Niedermayer
d8b6557c86
Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'
...
* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61':
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 09:51:37 +02:00
Michael Niedermayer
71091698a2
Merge commit '95220be1faac628d849a004644c0d102df0aa98b'
...
* commit '95220be1faac628d849a004644c0d102df0aa98b':
indeo3: fix off by one in MV validity check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 09:45:09 +02:00
Michael Niedermayer
fbaf75b166
h264: Use the correct croping values.
...
This fixes returning pictures with corrupted data pointers.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 00:06:26 +02:00
Michael Niedermayer
5299ee54a7
h264: assert that croping values at slice level are consistent
...
These values where checked before already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 23:49:56 +02:00
Michael Niedermayer
c3bd306e78
h264_ps: check croping values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 23:48:53 +02:00
Derek Buitenhuis
00b8e650e8
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-30 13:33:43 -04:00
Derek Buitenhuis
4cdb3c50b5
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-04-30 13:32:58 -04:00
Diego Biurrun
7f75f2f2bd
ppc: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:10:06 +02:00
Diego Biurrun
f2e9d44a57
x86: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:02:03 +02:00
Diego Biurrun
383fd4d478
arm: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:02:03 +02:00
Diego Biurrun
088f38a4f9
avcodec: Drop unnecessary ff_ name prefixes from static functions
2013-04-30 16:02:02 +02:00
Michael Niedermayer
53efb2fa09
gif: Fix little endian specific code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 13:35:14 +02:00
Diego Biurrun
38282149b6
ppc: More consistent arch initialization
2013-04-30 12:19:45 +02:00
Diego Biurrun
42b9150b0d
fft: Remove pointless #ifdefs around function declarations
2013-04-30 12:19:44 +02:00
Diego Biurrun
a053dbfcfb
ppc: Move AltiVec utility headers out of AltiVec ifdefs
...
Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
2013-04-30 12:19:44 +02:00
Diego Biurrun
6b110d3a73
ppc: More consistent names for H.264 optimizations files
2013-04-30 12:19:43 +02:00
Diego Biurrun
643e433bf7
mpegaudiosp: More consistent names for ppc/x86 optimization files
2013-04-30 12:19:43 +02:00
Anton Khirnov
e036bb7899
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
...
Otherwise some code might mistakenly think it is allowed to unref those
buffers, which would lead to double unref.
2013-04-30 11:15:32 +02:00
Anton Khirnov
bda9e6d923
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
...
They are the same in this case, except put_pixels also has blocksizes
smaller than 8.
2013-04-30 11:06:03 +02:00
Anton Khirnov
95220be1fa
indeo3: fix off by one in MV validity check
...
CC:libav-stable@libav.org
2013-04-30 11:06:03 +02:00
Michael Niedermayer
01a5a3a2e8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: dsputil: Remove a set of pointless #ifs around function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 08:42:10 +02:00
Michael Niedermayer
a3030d47e7
Merge commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295'
...
* commit '85f2f82af66fade2f5af2a03c5011d7de1b6e295':
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30 08:25:24 +02:00
Diego Biurrun
97c56ad796
x86: dsputil: Remove a set of pointless #ifs around function declarations
2013-04-30 01:42:32 +02:00
Diego Biurrun
85f2f82af6
x86: dsputil: cosmetics: Group ff_{avg|put}_pixels16_mmxext() declarations
2013-04-30 01:41:05 +02:00
Michael Niedermayer
16b2472d20
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: hpeldsp: Remove unused macro definitions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 22:01:53 +02:00
Diego Biurrun
20784aa678
x86: hpeldsp: Remove unused macro definitions
2013-04-29 15:57:00 +02:00
Michael Niedermayer
b691bc424f
copy_packet_data: fix memleak
...
This should fix gif fate memleaks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-29 03:08:50 +02:00
Michael Niedermayer
5149407731
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aac: check the maximum number of channels
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:54:56 +02:00
Michael Niedermayer
65af5e815a
Merge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'
...
* commit '1b6f84a98665a15130e969fd6b460a05d50090c1':
h264_refs: Do not print check_opcodes() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28 13:40:47 +02:00
Luca Barbato
a943a132f3
aac: check the maximum number of channels
...
Broken bitstreams could report a larger than specified number of
channels and cause outbound writes.
CC:libav-stable@libav.org
2013-04-28 00:40:33 +02:00
Michael Niedermayer
7f138310fb
ffv1enc: favor version 3 over 2 unless -strict -2 is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 22:48:13 +02:00
Diego Biurrun
1b6f84a986
h264_refs: Do not print check_opcodes() return value
...
The return value provides no useful information and removing the printing
avoids the following warning:
libavcodec/h264_refs.c:788:15: warning: 'i' may be used uninitialized in this function [-Wuninitialized]
2013-04-27 19:13:45 +02:00
Michael Niedermayer
d4868a960b
ffv1dec: remove redundant error message.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:36:05 +02:00
Michael Niedermayer
ff0b4c08ca
ffv1dec: add code to support frame threading with gop=1 ffv1
...
CODEC_CAP_FRAME_THREADS is not added yet because that would
unconditionally enable it, breaking gop>1 files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:20:42 +02:00
Michael Niedermayer
1a392fc550
ffv1: Store a flag in the global header that indicates if all frames are keyframes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 16:17:29 +02:00
Michael Niedermayer
3fa6c992d9
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
Conflicts:
tests/fate/ac3.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 11:35:03 +02:00
Michael Niedermayer
24bb01f038
avcodec_string: Print the used codec if it differs from the codec_id name.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 00:49:14 +02:00
Michael Niedermayer
59a3b6b751
avcodec_string: remove the "(hq)" listing
...
printing "hq" depending on a single video encoding parameter makes
little sense
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-27 00:49:12 +02:00
Michael Niedermayer
9a0aa8d02a
avcodec/intrax8: fix regression with wmv3
...
This also decreases dependancies between intrax8 and the outside
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 23:04:15 +02:00
Diego Biurrun
7c00e9d8ae
x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents
...
The function requires increasing the fuzz factor for the ac3/eac3 encode
tests and even so makes fate fail. It only provides a slight encoding
speedup for legacy CPUs that do not support SS2. Thus its benefit is not
worth the trouble it creates and fixing it would be a waste of time.
2013-04-26 21:06:52 +02:00
Michael Niedermayer
d78329700d
vc1dec: make sure next_use_ic is set correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 15:50:32 +02:00
Michael Niedermayer
ee4c01bef6
vc1dec: factor lut clean code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 15:39:32 +02:00
Paul B Mahol
30579b7ef0
dcaenc: silence address sanitizer warning
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 11:41:00 +00:00
Michael Niedermayer
721ffc691a
Merge remote-tracking branch 'qatar/master'
...
* commit '74685f6783e77f2545d48bd2124945ad5be39982':
x86: Rename dsputil_rnd_template.c to rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 11:10:57 +02:00
Michael Niedermayer
05f4c05061
vc1dec: remove interlaced warning
...
While not yet bugfree, the warning is IMHO no longer appropriate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 03:44:05 +02:00
Michael Niedermayer
688fc4ac56
vc1dec: Try to fix vc1_mc_4mv_chroma4() parameters
...
This fixes several chroma artifacts in several videos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 22:39:19 +02:00
Michael Niedermayer
9b49d3974e
vc1dec: add avg & variable direction support to vc1_mc_4mv_chroma4()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 22:39:19 +02:00
Michael Niedermayer
dd6e291e40
vc1dsp: add avg_no_rnd_vc1_chroma_mc4_c()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 22:39:19 +02:00
Michael Niedermayer
5183365aeb
vc1dec: fix doxy for vc1_mc_4mv_chroma4()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 22:39:19 +02:00
Paul B Mahol
2c5700c5e2
vima: add @file doxy
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 20:17:05 +00:00
Paul B Mahol
da22760364
vima: generate predict_table once, and share it with all decoders
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 20:15:33 +00:00
Paul B Mahol
77570a390d
lavc/cdxl: add @file doxy
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 20:06:13 +00:00
Martin Storsjö
74685f6783
x86: Rename dsputil_rnd_template.c to rnd_template.c
...
This makes it less confusing when this template is shared both by
dsputil and by hpeldsp.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-25 23:03:09 +03:00
Paul B Mahol
e1ba5fc968
dcaenc: update
...
Long story short: previous code was useless and was port of older
dcaenc, this commit just "sync" with current dcaenc, hopefuly
making this encoder more useful.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-25 14:21:00 +00:00
Michael Niedermayer
8f0db04b08
avcodec/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 16:01:42 +02:00
Michael Niedermayer
94b3a666fa
avcodec/pthread: Make sure ff_thread_finish_setup() conditions match
...
Prevents warning from being shown due to multiple calls.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 15:55:01 +02:00
Michael Niedermayer
32a6dfeb12
vc1dec: drop mv_f_last, simplify code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 13:51:44 +02:00
Paul B Mahol
aa96439fae
lavc: remove unused put_bits.h headers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-24 23:17:09 +00:00
Michael Niedermayer
d382170c5d
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavc: check decoded subtitles encoding.
lavu: fix GET_UTF8 macro.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 23:56:48 +02:00
Michael Niedermayer
12e3c1bee4
vc1dec: drop old use_ic code from vc1_b_mc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 21:56:34 +02:00
Michael Niedermayer
100184ccff
vc1: use use_ic instead of shuffling mv_mode around
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 21:08:17 +02:00
Michael Niedermayer
84c0ec92ae
vc1dec: Implement intensity compensation for vc1_interp_mc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 21:08:17 +02:00
Michael Niedermayer
782ebd6118
vc1dec: redesign the intensity compensation
...
The existing implementation had little to do with VC1.
This could be implemented by adjusting the reference frames
ithemselfs but that would make frame multi-threading difficult.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 21:07:26 +02:00
Nicolas George
70feca926b
lavc: check decoded subtitles encoding.
...
Address trac ticket #2431 .
2013-04-24 19:41:27 +02:00
Michael Niedermayer
c560437e95
vc1: make INIT_LUT() self contained
...
factorize variable declarations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 15:33:11 +02:00
Michael Niedermayer
c5669f3c59
vc1dec: fix current ptr selection in vc1_mc_4mv_chroma()
...
No sample tried shows a difference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 15:05:25 +02:00
Michael Niedermayer
236b0c4084
vc1dec: factorize picture pointer selection in vc1_mc_4mv_chroma()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 14:59:49 +02:00
Michael Niedermayer
72e5d91908
vc1dec: factorize picture pointer selection code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 14:50:41 +02:00
Michael Niedermayer
3fdd0979ac
vc1dec: Fix mv_f shuffling
...
Avoid a (confusing) memcpy()
Simpler code
Fixes a small number of artifacts in black_screen_VC-1.mkv
and several more artifacts in other videos
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 14:06:07 +02:00
Michael Niedermayer
1d0f817b17
vc1dec: Fix mv_f shuffling
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 13:16:27 +02:00
Michael Niedermayer
62d9445396
vc1: simplify code use INIT_LUT()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 12:52:52 +02:00
Michael Niedermayer
2e789d165b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: Get rid of duplication between *_rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 10:17:28 +02:00
Michael Niedermayer
8d86cf4cfa
Merge commit 'feec9349d35b3a46d0c6a05e3b23626050b76a77'
...
* commit 'feec9349d35b3a46d0c6a05e3b23626050b76a77':
mpegvideo: unref cur/next/prev frames when flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 10:11:34 +02:00
Michael Niedermayer
c2a0833c09
Merge commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223'
...
* commit '6a8561dbd7c078eb75985f7011ad1ad3fda9e223':
x86: Factorize duplicated inline assembly snippets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 10:01:15 +02:00
Michael Niedermayer
03b81df9e6
Merge commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b'
...
* commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b':
jpeg2000: Add mutlti-threading support to decoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 09:55:59 +02:00
Michael Niedermayer
fc69033371
avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC, Try #2
...
This should fix building with MSVC until someone can change the
code so it works with MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-24 02:02:25 +02:00
Martin Storsjö
486f76f029
x86: Get rid of duplication between *_rnd_template.c
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-23 23:30:17 +03:00
Hendrik Leppkes
feec9349d3
mpegvideo: unref cur/next/prev frames when flushing
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-23 19:11:59 +02:00
Martin Storsjö
6a8561dbd7
x86: Factorize duplicated inline assembly snippets
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-23 15:07:31 +02:00
Michael Niedermayer
7a617d6c17
avcodec/x86/sbrdsp_init: disable using the noise code in x86_64 MSVC
...
This should fix building with MSVC until someone can change the
code so it works with MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 12:46:28 +02:00
Nicolas Bertrand
2e2d24667a
jpeg2000: Add mutlti-threading support to decoder
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-23 11:53:04 +02:00
Michael Niedermayer
0a73803c86
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: Move some conditional code around to avoid unused variable warnings
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 11:01:46 +02:00
Michael Niedermayer
5056cff125
Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'
...
* commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d':
jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 10:24:49 +02:00
Michael Niedermayer
7c49c8b0ac
Merge commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7'
...
* commit '94660c35249e11c53b9a9f0c2f85c4335b21eda7':
threads: always call thread_finish_setup for intra codecs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 10:12:58 +02:00
Piotr Bandurski
f4596e8bb6
mjpegdec: Add support for 4:1:1 YUV
...
Fixes part of ticket 2004
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 22:03:09 +02:00
Michael Niedermayer
2ae91c86f3
avcodec_get_context_defaults3: set codec_id
...
Fixes Ticket1996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 21:44:05 +02:00
Michael Niedermayer
e2e9bee2da
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avcodec: Bump minor for JPEG 2000 decoder
JPEG 2000 decoder for DCinema
The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/mqc.c
libavcodec/mqc.h
libavcodec/mqcdec.c
libavcodec/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 20:00:54 +02:00
Michael Niedermayer
c1c2b0b339
avcodec: rename jpeg2000 decoder to j2k
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 19:28:33 +02:00
Michael Niedermayer
7a556ebccf
Merge commit '0c15a9aa7e1654a19144eb594f9639a57fd47482'
...
* commit '0c15a9aa7e1654a19144eb594f9639a57fd47482':
sh4: Remove dubious aligned dsputil code
Conflicts:
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/h264chroma_init.c
libavcodec/sh4/hpeldsp.c
libavcodec/sh4/qpel.c
If someone wants to maintain the sh4 code in ffmpeg, wants to
add more optimizations, or volunteers to maintain any of
what is removed here and can confirm that they are faster.
Then please contact us!
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 18:59:23 +02:00
Michael Niedermayer
430d69c942
Merge commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85'
...
* commit 'b4ad7c54c878dead7dfa4838b912a530c1debe85':
x86: cavs: Refactor duplicate dspfunc macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 18:37:44 +02:00
Michael Niedermayer
f84e373797
Merge commit '78fa0bd0f7067868943c0899907e313414492426'
...
* commit '78fa0bd0f7067868943c0899907e313414492426':
x86: cavs: Put mmx-specific code into its own init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 18:29:05 +02:00
Diego Biurrun
c1ad70c3cb
x86: Move some conditional code around to avoid unused variable warnings
2013-04-22 17:50:02 +02:00
Janne Grunau
10f1a4d9bd
jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12
2013-04-22 17:11:21 +02:00
Janne Grunau
94660c3524
threads: always call thread_finish_setup for intra codecs
...
Intra codecs do not need an update_thread_context() function and never
call ff_thread_finish_setup(). They rely on ff_thread_get_buffer()
calling it. So call it even if the get_buffer2 function pointer is
avcodec_default_get_buffer2 and it has not been called before.
2013-04-22 17:11:20 +02:00
Diego Biurrun
f13888afcc
avcodec: Bump minor for JPEG 2000 decoder
2013-04-22 15:52:43 +02:00
Nicolas Bertrand
c81a706381
JPEG 2000 decoder for DCinema
...
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-22 15:38:29 +02:00
Michael Niedermayer
2288c77689
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: Remove some duplicate function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 13:07:20 +02:00
Diego Biurrun
0c15a9aa7e
sh4: Remove dubious aligned dsputil code
...
The code represents a considerable maintenance burden and it is not
clear that it gives a noticeable benefit to outweigh this after 10
years of improvements in compiler technology since its creation.
2013-04-22 12:12:24 +02:00
Diego Biurrun
b4ad7c54c8
x86: cavs: Refactor duplicate dspfunc macro
2013-04-22 12:05:09 +02:00
Diego Biurrun
fce99322b0
h264: Drop unused variable
2013-04-22 12:05:09 +02:00
Diego Biurrun
78fa0bd0f7
x86: cavs: Put mmx-specific code into its own init function
...
Before, this code was labeled as mmxext and enabled both for the
3dnow and the mmxext case.
2013-04-22 10:42:50 +02:00
Diego Biurrun
311a592dfc
x86: Remove some duplicate function declarations
2013-04-22 02:29:57 +02:00
Michael Niedermayer
de9fbf3dc4
indeo4: implement haar 8x1 and 1x8 transforms
...
Fixes Ticket1984
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 02:29:12 +02:00
Michael Niedermayer
83330cf5fa
init_vlc_sparse: fix leak on error
...
Fixes CID1005312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 11:55:19 +02:00
Michael Niedermayer
2d23493020
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
ppc: hpeldsp: Include attributes.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 09:54:02 +02:00
Roberto Togni
8017683647
qdm2: initialize coeff_per_sb_select from bit_rate
...
The value of coeff_per_sb_select depends on the bit rate, not on
sub_sampling.
Also remove the calculation of tmp, no longer needed.
Fixes tickets #1868 and #742 (only audio part)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21 02:00:06 +02:00
Michael Niedermayer
4824aea7af
avcodec/mpegvideo: change asserts to av_asserts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 21:31:19 +02:00
Michael Niedermayer
0dd25e4699
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: Remove unused inline asm instruction defines
vc1: Remove now unused variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 16:24:15 +02:00
Michael Niedermayer
0e3d2b2c8d
Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'
...
* commit '287c8db39e71af7047e551bbfd1264d771cccbc9':
cosmetics: bfin: Fix indentation in the dsputil init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 16:19:59 +02:00
Michael Niedermayer
9ae56b85b6
Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
...
* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
dsputil: Remove non-8bpp draw_edge
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 16:07:20 +02:00
Michael Niedermayer
f6dcd844ee
Merge commit '619e0da19119bcd683f135fe9a164f37c0ca70d1'
...
* commit '619e0da19119bcd683f135fe9a164f37c0ca70d1':
dsputil: Remove unused 32-bit functions
Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:55:29 +02:00
Martin Storsjö
6d0fbebf94
ppc: hpeldsp: Include attributes.h
...
This fixes building in configurations where altivec is disabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-20 16:43:01 +03:00
Michael Niedermayer
d2d2c309e8
Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'
...
* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
dsputil: Remove hpel functions (moved to hpeldsp)
Conflicts:
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:36:23 +02:00
Michael Niedermayer
6ec26157b9
Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
...
* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:24:25 +02:00
Michael Niedermayer
fdb1f7eb7a
Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'
...
* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493':
sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.h
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/hpeldsp_vis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:11:06 +02:00
Michael Niedermayer
4bdec0e71e
Merge commit '278bd2054ca61ab70dfe38f1774409cda2da5359'
...
* commit '278bd2054ca61ab70dfe38f1774409cda2da5359':
sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/dsputil_sh4.h
libavcodec/sh4/hpeldsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 15:04:06 +02:00
Michael Niedermayer
c5a11ab6d1
Merge commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075'
...
* commit 'bfb41b5039e36b7f873d6ea7d24b31bf3e1a8075':
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/bfin/Makefile
libavcodec/bfin/hpel_pixels_bfin.S
libavcodec/bfin/hpeldsp_bfin.c
libavcodec/bfin/hpeldsp_bfin.h
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 14:31:11 +02:00
Michael Niedermayer
c4010972c4
Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'
...
* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb':
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/hpeldsp_arm.S
libavcodec/arm/hpeldsp_arm.h
libavcodec/arm/hpeldsp_armv6.S
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/arm/hpeldsp_init_armv6.c
libavcodec/arm/hpeldsp_init_neon.c
libavcodec/arm/hpeldsp_neon.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 14:19:08 +02:00
Michael Niedermayer
055e5c8e01
Merge commit '47e5a98174eb9c07ad17be71df129719d60ec8b7'
...
* commit '47e5a98174eb9c07ad17be71df129719d60ec8b7':
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.h
libavcodec/ppc/hpeldsp_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 13:52:58 +02:00
Michael Niedermayer
d0aa60da10
Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'
...
* commit '8db00081a37d5b7e23918ee500bb16bc59b57197':
x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 13:42:51 +02:00
Michael Niedermayer
3fee9fa022
Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'
...
* commit '28bc406c84b04a5f1458b90ff52ddbec73e46202':
mjpeg: Use hpeldsp instead of dsputil for half-pel functions
svq1enc: Use hpeldsp instead of dsputil for half-pel functions
Conflicts:
configure
libavcodec/mjpegdec.c
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 13:21:18 +02:00
Michael Niedermayer
ab4ba6b74d
Merge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'
...
* commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129':
svq3: Use hpeldsp instead of dsputil for half-pel functions
mpegvideo: Use hpeldsp instead of dsputil for half-pel functions
svq1: Use hpeldsp instead of dsputil for half-pel functions
mimic: Use hpeldsp instead of dsputil for half-pel functions
Conflicts:
configure
libavcodec/motion_est.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 10:12:07 +02:00
Michael Niedermayer
3c6621708b
Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'
...
* commit '8071264f2196d71ff49c3944c33f8d3d83f548f1':
interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
bink: Use hpeldsp instead of dsputil for half-pel functions
indeo3: Use hpeldsp instead of dsputil for half-pel functions
vp56: Use hpeldsp instead of dsputil for half-pel functions
vp3: Use hpeldsp instead of dsputil for half-pel functions
Conflicts:
libavcodec/bink.c
libavcodec/indeo3.c
libavcodec/vp56.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 10:01:54 +02:00
Michael Niedermayer
23de9e91df
Merge commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0'
...
* commit '68d8238cca52e50e8cc81bf2edcaf8088c52d4c0':
hpeldsp: Add half-pel functions (currently copies of dsputil)
Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 09:42:07 +02:00
Michael Niedermayer
6c9d28a229
vc1dec: Fix tff == 0 handling in init_block_index()
...
This fixes several files from VLC ticket5887
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 02:22:32 +02:00
Michael Niedermayer
a0fbc28c38
vc1dec: Fix non pullup tff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 02:22:32 +02:00
Michael Niedermayer
8ebfd7c49e
h264: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-20 02:22:32 +02:00
Clément Bœsch
a16c20569d
lavf/gifdec: add loop support.
...
Loop is ignored by default.
2013-04-20 00:05:35 +02:00
Clément Bœsch
f5ede48fbb
lavc/gif: miscellaneous cosmetics.
2013-04-19 23:59:22 +02:00
Clément Bœsch
e1b35bdde2
lavc/gif: add flag to enable transparency detection between frames.
...
While this is not always optimal, in practice most of the common cases are.
ffmpeg -i big_buck_bunny_1080p_h264.mov -ss 45 -vf scale=320:160 -gifflags -transdiff -frames:v 50 -y bbb-notrans.gif
ffmpeg -i big_buck_bunny_1080p_h264.mov -ss 45 -vf scale=320:160 -gifflags +transdiff -frames:v 50 -y bbb-trans.gif
-rw-r--r-- 1 ubitux ubitux 1.1M Apr 19 19:00 bbb-notrans.gif
-rw-r--r-- 1 ubitux ubitux 378K Apr 19 19:00 bbb-trans.gif
2013-04-19 23:59:21 +02:00