0e3d2b2c8d
Merge commit '287c8db39e71af7047e551bbfd1264d771cccbc9'
...
* commit '287c8db39e71af7047e551bbfd1264d771cccbc9':
cosmetics: bfin: Fix indentation in the dsputil init function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9ae56b85b6
Merge commit 'd4d186d185df98492d8935a87c5b5cf369db9748'
...
* commit 'd4d186d185df98492d8935a87c5b5cf369db9748':
dsputil: Remove non-8bpp draw_edge
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
bf66016e4c
Merge commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d'
...
* commit 'c9f5fcd08c3a33bfb1b473705c792ab051e7428d':
dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge
Conflicts:
libavcodec/dsputil.c
No difference as this has been part of ffmpeg since a while and
the rebased commit does also not introduce new changes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
c3624cfe76
Merge commit 'c443117f25e034c1e3ef35334b61b937e1e208ff'
...
* commit 'c443117f25e034c1e3ef35334b61b937e1e208ff':
dsputil: Remove dct_bits
Conflicts:
libavcodec/dsputil.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
6d0fbebf94
ppc: hpeldsp: Include attributes.h
...
This fixes building in configurations where altivec is disabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
d2d2c309e8
Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'
...
* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
dsputil: Remove hpel functions (moved to hpeldsp)
Conflicts:
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
a0fbc28c38
vc1dec: Fix non pullup tff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
8ebfd7c49e
h264: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
67cc31d6c7
lavf/gif: add final_delay option.
12 years ago
a16c20569d
lavf/gifdec: add loop support.
...
Loop is ignored by default.
12 years ago
f5ede48fbb
lavc/gif: miscellaneous cosmetics.
12 years ago
7004cad36d
Changelog: notify GIF improvements.
12 years ago
5927ebab51
doc/general: animated GIF are now compressed.
12 years ago
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
12 years ago
0f1250b7e5
lavc/gif: make possible to disable offsetting.
12 years ago
b71a0507b0
x86: Remove unused inline asm instruction defines
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
a60136ee57
vc1: Remove now unused variables
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
8f116bf71b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
fate: cosmetics: More sensible order for entries in video filter file
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
e07e8882ae
Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'
...
* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a':
fate: Rename video filters file and add separate video filters target
Conflicts:
tests/fate/filter-video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
6c5989cce9
Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'
...
* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
fate: Split audio filters into their own separate file
Conflicts:
tests/Makefile
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
4cb59ad84b
Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'
...
* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
fate: Reuse VREF and AREF variables where appropriate
Conflicts:
tests/fate/filter.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
287c8db39e
cosmetics: bfin: Fix indentation in the dsputil init function
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
d4d186d185
dsputil: Remove non-8bpp draw_edge
...
It is never used.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
c9f5fcd08c
dsputil: Merge 9-10 bpp functions for get_pixels and draw_edge
...
These only care about pixel storage unit size, not actual bits
used (i.e. they don't clip).
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
619e0da191
dsputil: Remove unused 32-bit functions
...
Previously, if dct_bits was set to 32, we used separate 32-bit
versions of these functions. Since dct_bits now is removed,
remove the unused 32-bit versions of the functions.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
c443117f25
dsputil: Remove dct_bits
...
dct_bits is never set except in h264, where it is never used,
thus remove it.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
54cd5e4f92
dsputil: Remove hpel functions (moved to hpeldsp)
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
2957d29f05
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
78ce568e43
sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
278bd2054c
sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
bfb41b5039
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
7384b7a713
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
47e5a98174
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
8db00081a3
x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
28bc406c84
mjpeg: Use hpeldsp instead of dsputil for half-pel functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
1277dc07fb
svq1enc: Use hpeldsp instead of dsputil for half-pel functions
...
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Michael Niedermayer
Martin Storsjö
Clément Bœsch
Ronald S. Bultje