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
Clément Bœsch
0f1250b7e5
lavc/gif: make possible to disable offsetting.
2013-04-19 23:59:21 +02:00
Michael Niedermayer
f4b05cd841
Merge commit '5e83d9aced2fc2b2e1360452794c58aba55d497c'
...
* commit '5e83d9aced2fc2b2e1360452794c58aba55d497c':
h264: fully support cropping.
Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/h264_ps.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-19 22:46:51 +02:00
Ronald S. Bultje
54cd5e4f92
dsputil: Remove hpel functions (moved to hpeldsp)
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:29:22 +03:00
Ronald S. Bultje
2957d29f05
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:29:22 +03:00
Ronald S. Bultje
78ce568e43
sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:29:22 +03:00
Michael Niedermayer
278bd2054c
sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:29:21 +03:00
Ronald S. Bultje
bfb41b5039
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:19:13 +03:00
Ronald S. Bultje
7384b7a713
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:19:08 +03:00
Ronald S. Bultje
47e5a98174
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:59 +03:00
Ronald S. Bultje
8db00081a3
x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:53 +03:00
Ronald S. Bultje
28bc406c84
mjpeg: Use hpeldsp instead of dsputil for half-pel functions
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:38 +03:00
Ronald S. Bultje
1277dc07fb
svq1enc: Use hpeldsp instead of dsputil for half-pel functions
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:32 +03:00
Ronald S. Bultje
2f6bc5f7c1
svq3: Use hpeldsp instead of dsputil for half-pel functions
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:27 +03:00
Ronald S. Bultje
f4fed5a2f9
mpegvideo: Use hpeldsp instead of dsputil for half-pel functions
...
This also converts vc1, since that is mpegvideo-based.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:21 +03:00
Ronald S. Bultje
6caa44aa7d
svq1: Use hpeldsp instead of dsputil for half-pel functions
...
This makes svq1 independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:14 +03:00
Ronald S. Bultje
c10470035e
mimic: Use hpeldsp instead of dsputil for half-pel functions
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:08 +03:00
Ronald S. Bultje
8071264f21
interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
...
This makes interplayvideo independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:18:02 +03:00
Ronald S. Bultje
0f0a11d576
bink: Use hpeldsp instead of dsputil for half-pel functions
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:17:56 +03:00
Ronald S. Bultje
8f992dc8c7
indeo3: Use hpeldsp instead of dsputil for half-pel functions
...
This makes the Indeo 3 decoder independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:17:50 +03:00
Ronald S. Bultje
cb7ecb7563
vp56: Use hpeldsp instead of dsputil for half-pel functions
...
This makes vp5 and vp6 independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:17:33 +03:00
Ronald S. Bultje
3bd062bf7f
vp3: Use hpeldsp instead of dsputil for half-pel functions
...
This makes vp3 independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:17:26 +03:00
Ronald S. Bultje
68d8238cca
hpeldsp: Add half-pel functions (currently copies of dsputil)
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-04-19 23:17:17 +03:00
Michael Niedermayer
05b2c998c7
avcodec: Fix lowres handling in buffer allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-19 21:49:36 +02:00
Michael Niedermayer
a8b05dde0d
Merge commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72'
...
* commit 'a7f46586bf47174b5fa00a905b767b1781ec8b72':
ff_get_buffer(): allocate the frame for max(coded,display) dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-19 21:49:29 +02:00
Michael Niedermayer
42bcc4082d
avcodec/mpegvideo_motion: Use a field from the current frame if the last is unavailable in DMV & 16x8
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-19 14:48:01 +02:00
Christophe Gisquet
76c7277385
x86: sbrdsp: implement SSE2 hf_apply_noise
...
233 to 105 cycles on Arrandale and Win64.
Replacing the multiplication by s_m[m] by a pand and a pxor with
appropriate vectors is slower. Unrolling is a 15 cycles win.
A SSE version was 4 cycles slower.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-04-19 13:19:45 +02:00
Clément Bœsch
380cfce2b2
lavc: add AV_CODEC_PROP_TEXT_SUB.
...
CC are not marked. Also allow potential mixed types later.
2013-04-19 13:15:54 +02:00
Anton Khirnov
5e83d9aced
h264: fully support cropping.
...
Based on a patch by Vittorio Giovara <vittorio.giovara@gmail.com >
Fixes Bug 378.
2013-04-19 09:28:08 +02:00
Anton Khirnov
a7f46586bf
ff_get_buffer(): allocate the frame for max(coded,display) dimensions
...
Needed e.g. for h264 cropping to work properly.
2013-04-19 09:26:53 +02:00
Clément Bœsch
13478b270a
gif: use only one graphic control extension block per image.
...
The encoder now doesn't produce any extra graphic control extension
block anymore. Only the image is encoded, and the muxer writing
its own GCE containing notably the timing information now includes the
optional palette transmitted through packet side data.
This commit avoid setting clashes between the two GCE, and reduce the
size of the generated file with pal8 output.
2013-04-19 02:10:59 +02:00
Clément Bœsch
7b80b3cef0
lavc/utils: merge side data after video encode.
...
This allows encoders to communicate side data to the muxers.
2013-04-19 02:10:12 +02:00
Reimar Döffinger
a39cd8766f
Fix multithreaded MPEG-4 decoding.
...
Regression since c10d498bfd .
Unfortunately ff_thread_get_format can only be called from
a separate decode thread, running it during init will fail.
Fixes for that are welcome, for now just revert back to
calling avctx->get_format directly, which is correct
but having to decide on a case-by-case basis which approach
to use is a bit messy.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2013-04-19 01:26:54 +02:00