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
67cc31d6c7
lavf/gif: add final_delay option.
2013-04-20 00:11:04 +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
7004cad36d
Changelog: notify GIF improvements.
2013-04-19 23:59:22 +02:00
Clément Bœsch
5927ebab51
doc/general: animated GIF are now compressed.
2013-04-19 23:59:21 +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
Martin Storsjö
b71a0507b0
x86: Remove unused inline asm instruction defines
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-20 00:44:54 +03:00
Martin Storsjö
a60136ee57
vc1: Remove now unused variables
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-20 00:44:49 +03:00
Michael Niedermayer
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>
2013-04-19 23:34:58 +02:00
Michael Niedermayer
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>
2013-04-19 23:26:55 +02:00
Michael Niedermayer
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>
2013-04-19 23:13:20 +02:00
Michael Niedermayer
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>
2013-04-19 22:55: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
Martin Storsjö
287c8db39e
cosmetics: bfin: Fix indentation in the dsputil init function
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:29:22 +03:00
Ronald S. Bultje
d4d186d185
dsputil: Remove non-8bpp draw_edge
...
It is never used.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-19 23:29:22 +03:00
Ronald S. Bultje
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>
2013-04-19 23:29:22 +03:00
Ronald S. Bultje
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>
2013-04-19 23:29:22 +03:00
Ronald S. Bultje
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>
2013-04-19 23:29:22 +03: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
194d0399a2
Merge commit '505642f18276aed03278ac91b1f334ea888eac6a'
...
* commit '505642f18276aed03278ac91b1f334ea888eac6a':
mp3dec: fallback to generic seeking when a TOC is not present
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 21:36:23 +02:00
Diego Biurrun
bc7fbd36ea
fate: cosmetics: More sensible order for entries in video filter file
2013-04-19 18:07:48 +02:00
Diego Biurrun
a77aed142c
fate: Rename video filters file and add separate video filters target
2013-04-19 18:07:48 +02:00
Diego Biurrun
b357f1d1d3
fate: Split audio filters into their own separate file
2013-04-19 18:07:48 +02:00
Diego Biurrun
3eec1d41b4
fate: Reuse VREF and AREF variables where appropriate
2013-04-19 18:07:48 +02:00