]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 20 Apr 2013 13:55:29 +0000 (15:55 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 13:43:33 +0000 (15:43 +0200)]
Merge commit '
c443117f25e034c1e3ef35334b61b937e1e208ff '
* commit '
c443117f25e034c1e3ef35334b61b937e1e208ff ':
dsputil: Remove dct_bits
Conflicts:
libavcodec/dsputil.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 19 Apr 2013 22:29:17 +0000 (01:29 +0300)]
ppc: hpeldsp: Include attributes.h
This fixes building in configurations where altivec is disabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 20 Apr 2013 13:36:23 +0000 (15:36 +0200)]
Merge commit '
54cd5e4f92de6bd0fb8e24069153b0156c8136bc '
* commit '
54cd5e4f92de6bd0fb8e24069153b0156c8136bc ':
dsputil: Remove hpel functions (moved to hpeldsp)
Conflicts:
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Apr 2013 13:24:25 +0000 (15:24 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 13:11:06 +0000 (15:11 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 12:47:10 +0000 (14:47 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 12:29:16 +0000 (14:29 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 12:11:10 +0000 (14:11 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 11:52:58 +0000 (13:52 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 11:42:51 +0000 (13:42 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 11:21:18 +0000 (13:21 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 08:12:07 +0000 (10:12 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 07:57:00 +0000 (09:57 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 07:40:02 +0000 (09:40 +0200)]
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>
Michael Niedermayer [Sat, 20 Apr 2013 00:15:13 +0000 (02:15 +0200)]
vc1dec: Fix tff == 0 handling in init_block_index()
This fixes several files from VLC ticket5887
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 20 Apr 2013 00:14:43 +0000 (02:14 +0200)]
vc1dec: Fix non pullup tff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Apr 2013 21:43:40 +0000 (23:43 +0200)]
h264: remove unused variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Fri, 19 Apr 2013 22:11:04 +0000 (00:11 +0200)]
lavf/gif: add final_delay option.
Clément Bœsch [Thu, 18 Apr 2013 20:21:58 +0000 (22:21 +0200)]
lavf/gifdec: add loop support.
Loop is ignored by default.
Clément Bœsch [Fri, 19 Apr 2013 21:56:19 +0000 (23:56 +0200)]
lavc/gif: miscellaneous cosmetics.
Clément Bœsch [Fri, 19 Apr 2013 21:53:55 +0000 (23:53 +0200)]
Changelog: notify GIF improvements.
Clément Bœsch [Fri, 19 Apr 2013 21:52:39 +0000 (23:52 +0200)]
doc/general: animated GIF are now compressed.
Clément Bœsch [Fri, 19 Apr 2013 17:01:37 +0000 (19:01 +0200)]
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
Clément Bœsch [Fri, 19 Apr 2013 21:36:55 +0000 (23:36 +0200)]
lavc/gif: make possible to disable offsetting.
Martin Storsjö [Fri, 19 Apr 2013 21:06:48 +0000 (00:06 +0300)]
x86: Remove unused inline asm instruction defines
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 19 Apr 2013 21:04:20 +0000 (00:04 +0300)]
vc1: Remove now unused variables
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 19 Apr 2013 21:34:58 +0000 (23:34 +0200)]
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>
Michael Niedermayer [Fri, 19 Apr 2013 21:26:55 +0000 (23:26 +0200)]
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>
Michael Niedermayer [Fri, 19 Apr 2013 21:11:44 +0000 (23:11 +0200)]
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>
Michael Niedermayer [Fri, 19 Apr 2013 20:55:21 +0000 (22:55 +0200)]
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>
Michael Niedermayer [Fri, 19 Apr 2013 20:24:33 +0000 (22:24 +0200)]
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>
Martin Storsjö [Wed, 3 Apr 2013 11:11:38 +0000 (04:11 -0700)]
cosmetics: bfin: Fix indentation in the dsputil init function
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Thu, 14 Mar 2013 17:01:52 +0000 (10:01 -0700)]
dsputil: Remove non-8bpp draw_edge
It is never used.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Tue, 26 Mar 2013 15:09:05 +0000 (17:09 +0200)]
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>
Ronald S. Bultje [Tue, 26 Mar 2013 15:07:22 +0000 (17:07 +0200)]
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>
Ronald S. Bultje [Tue, 26 Mar 2013 15:00:21 +0000 (17:00 +0200)]
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>
Ronald S. Bultje [Sun, 10 Mar 2013 21:23:46 +0000 (14:23 -0700)]
dsputil: Remove hpel functions (moved to hpeldsp)
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 23:53:07 +0000 (16:53 -0700)]
alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 23:51:25 +0000 (16:51 -0700)]
sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 10 Mar 2013 23:48:31 +0000 (16:48 -0700)]
sh4: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 23:40:23 +0000 (16:40 -0700)]
bfin: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 23:16:45 +0000 (16:16 -0700)]
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 22:50:53 +0000 (15:50 -0700)]
ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 22:37:59 +0000 (15:37 -0700)]
x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 21:23:52 +0000 (14:23 -0700)]
mjpeg: Use hpeldsp instead of dsputil for half-pel functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 21:16:00 +0000 (14:16 -0700)]
svq1enc: Use hpeldsp instead of dsputil for half-pel functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 21:12:58 +0000 (14:12 -0700)]
svq3: Use hpeldsp instead of dsputil for half-pel functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 20:55:07 +0000 (13:55 -0700)]
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>
Ronald S. Bultje [Sun, 10 Mar 2013 20:38:45 +0000 (13:38 -0700)]
svq1: Use hpeldsp instead of dsputil for half-pel functions
This makes svq1 independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 20:32:10 +0000 (13:32 -0700)]
mimic: Use hpeldsp instead of dsputil for half-pel functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 19:58:02 +0000 (12:58 -0700)]
interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
This makes interplayvideo independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 16:12:01 +0000 (09:12 -0700)]
bink: Use hpeldsp instead of dsputil for half-pel functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 10 Mar 2013 15:19:27 +0000 (08:19 -0700)]
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>
Ronald S. Bultje [Sun, 10 Mar 2013 13:55:58 +0000 (06:55 -0700)]
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>
Ronald S. Bultje [Sun, 10 Mar 2013 05:26:09 +0000 (21:26 -0800)]
vp3: Use hpeldsp instead of dsputil for half-pel functions
This makes vp3 independent of dsputil.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sat, 9 Mar 2013 23:14:35 +0000 (15:14 -0800)]
hpeldsp: Add half-pel functions (currently copies of dsputil)
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 19 Apr 2013 19:43:15 +0000 (21:43 +0200)]
avcodec: Fix lowres handling in buffer allocation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Apr 2013 19:40:46 +0000 (21:40 +0200)]
Merge commit '
a7f46586bf47174b5fa00a905b767b1781ec8b72 '
* commit '
a7f46586bf47174b5fa00a905b767b1781ec8b72 ':
ff_get_buffer(): allocate the frame for max(coded,display) dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Apr 2013 19:30:39 +0000 (21:30 +0200)]
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>
Diego Biurrun [Tue, 16 Apr 2013 14:46:40 +0000 (16:46 +0200)]
fate: cosmetics: More sensible order for entries in video filter file
Diego Biurrun [Tue, 16 Apr 2013 14:43:49 +0000 (16:43 +0200)]
fate: Rename video filters file and add separate video filters target
Diego Biurrun [Tue, 16 Apr 2013 14:38:02 +0000 (16:38 +0200)]
fate: Split audio filters into their own separate file
Diego Biurrun [Tue, 16 Apr 2013 14:32:18 +0000 (16:32 +0200)]
fate: Reuse VREF and AREF variables where appropriate
Michael Niedermayer [Fri, 19 Apr 2013 15:30:13 +0000 (17:30 +0200)]
avformat: change seeking index consistency asserts to av_asserts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 19 Apr 2013 12:46:31 +0000 (14:46 +0200)]
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>
Clément Bœsch [Fri, 19 Apr 2013 12:44:58 +0000 (14:44 +0200)]
lavf/http: remove duplicated dec flag.
Christophe Gisquet [Tue, 9 Apr 2013 20:16:36 +0000 (22:16 +0200)]
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>
Clément Bœsch [Tue, 16 Apr 2013 13:00:13 +0000 (15:00 +0200)]
lavc: add AV_CODEC_PROP_TEXT_SUB.
CC are not marked. Also allow potential mixed types later.
Clément Bœsch [Fri, 19 Apr 2013 10:11:10 +0000 (12:11 +0200)]
lavf/gif: avoid forward declaration.
Clément Bœsch [Fri, 19 Apr 2013 02:02:12 +0000 (04:02 +0200)]
lavf/gif: correct the delay after the first frame.
To define accurately the delay between two frames, it is necessary to
have both available. Before this commit, the first frame had a delay of
0; while in practice the problem is not visible in most situation, it is
problematic with low frame rate and large scene change.
This commit notably fixes output generated with commands such as:
ffmpeg -i big_buck_bunny_1080p_h264.mov
-vf "select='gt(scene,0.4)',scale=320:-1,setpts=N/TB"
-frames:v 5 -y out.gif
Also, to avoid odd loop delays, the N-1 delay is duplicated for the last
frame.
Anton Khirnov [Mon, 18 Feb 2013 15:32:18 +0000 (16:32 +0100)]
h264: fully support cropping.
Based on a patch by Vittorio Giovara <vittorio.giovara@gmail.com>
Fixes Bug 378.
Anton Khirnov [Mon, 18 Feb 2013 15:29:03 +0000 (16:29 +0100)]
ff_get_buffer(): allocate the frame for max(coded,display) dimensions
Needed e.g. for h264 cropping to work properly.
Michael Niedermayer [Thu, 20 Sep 2012 20:00:52 +0000 (22:00 +0200)]
mp3dec: fallback to generic seeking when a TOC is not present
Fixes seeking without a Xing/Info header.
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Paul B Mahol [Fri, 19 Apr 2013 00:50:23 +0000 (00:50 +0000)]
lavfi/afade: use AV_OPT_TYPE_DURATION
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Thu, 18 Apr 2013 13:09:37 +0000 (15:09 +0200)]
lavf/gif: fix timing.
pkt->duration can not be used since the values are only based on frame
rate.
Clément Bœsch [Thu, 18 Apr 2013 01:35:20 +0000 (03:35 +0200)]
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.
Clément Bœsch [Thu, 18 Apr 2013 15:19:37 +0000 (17:19 +0200)]
lavc/utils: merge side data after video encode.
This allows encoders to communicate side data to the muxers.
Clément Bœsch [Thu, 18 Apr 2013 16:51:16 +0000 (18:51 +0200)]
fate/gif: create meaningful gif encoding tests.
Marton Balint [Wed, 10 Apr 2013 23:09:41 +0000 (01:09 +0200)]
mxfdec: fix return variable type for avio_seek
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Thu, 18 Apr 2013 17:11:04 +0000 (19:11 +0200)]
Fix multithreaded MPEG-4 decoding.
Regression since
c10d498bfd246a40cc7830838b74e18a79418839 .
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>
Michael Niedermayer [Thu, 18 Apr 2013 23:02:17 +0000 (01:02 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
ffmpeg: make -aspect work with -vcodec copy.
lavfi/vf_aspect: improve compatibility of parsing.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Apr 2013 21:10:46 +0000 (23:10 +0200)]
avformat: Dont stop probing before the whole id3 tag is read
When a file appears to start with a id3 tag and appears to
also be something else, then try to increase the probe buffer
size if its below its limit.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 17 Apr 2013 20:11:21 +0000 (22:11 +0200)]
lavfi/mptestsrc: fix invalid access in case of negative linesize
In particular, fix crash with:
ffplay -f lavfi mptestsrc,vflip
Clément Bœsch [Thu, 3 Jan 2013 02:06:43 +0000 (03:06 +0100)]
subtitles: introduce ASS codec id and use it.
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA
markup is muxed in a standalone .ass/.ssa file. This means the AVPacket
data starts with a "Dialogue:" string, followed by a timing information
(start and end of the event as string) and a trailing CRLF after each
line. One packet can contain several lines. We'll refer to this layout
as "SSA" or "SSA lines".
In matroska, this markup is not stored as such: it has no "Dialogue:"
prefix, it contains a ReadOrder field, the timing information is not in
the payload, and it doesn't contain the trailing CRLF. See [1] for more
info. We'll refer to this layout as "ASS".
Since we have only one common codec for both formats, the matroska
demuxer is constructing an AVPacket following the "SSA lines" format.
This causes several problems, so it was decided to change this into
clean ASS packets.
Some insight about what is changed or unchanged in this commit:
CODECS
------
- the decoding process still writes "SSA lines" markup inside the ass
fields of the subtitles rectangles (sub->rects[n]->ass), which is
still the current common way of representing decoded subtitles
markup. It is meant to change later.
- new ASS codec id: AV_CODEC_ID_ASS (which is different from the
legacy AV_CODEC_ID_SSA)
- lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of
"ass") for consistency with the codec id and allows to add a real
ass decoder. This ass decoder receives clean ASS lines (so it starts
with a ReadOrder, is followed by the Layer, etc). We make sure this
is decoded properly in a new ass-line rectangle of the decoded
subtitles (the ssa decoder OTOH is doing a simple straightforward
copy). Using the packet timing instead of data string makes sure the
ass-line now contains the appropriate timing.
- lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed
into "ssa" (instead of "ass") for consistency with the codec id, and
allows to add a real "ass" encoder.
One important thing about this encoder is that it only supports one
ass rectangle: we could have put several dialogue events in the
AVPacket (separated by a \0 for instance) but this would have cause
trouble for the muxer which needs not only the start time, but also
the duration: typically, you have merged events with the same start
time (stored in the AVPacket->pts) but a different duration. At the
moment, only the matroska do the merge with the SSA-line codec.
We will need to make sure all the decoders in the future can't add
more than one rectangle (and only one Dialogue line in it
obviously).
FORMATS
-------
- lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets.
In the case of ASS packets as input, it adds the timing based on the
AVPacket pts and duration, and mux it with "Dialogue:", trailing
CRLF, etc.
- lavf/assdec: unchanged; it currently still only outputs SSA-lines
packets.
- lavf/mkv: the demuxer can now output ASS packets without the need of
any "SSA-lines" reconstruction hack. It will become the default at
next libavformat bump, and the SSA support will be dropped from the
demuxer. The muxer can take ASS packets since it's muxed normally,
and still supports the old SSA packets. All the SSA support and
hacks in Matroska code will be dropped at next lavf bump.
[1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
Nicolas George [Tue, 9 Apr 2013 09:21:47 +0000 (11:21 +0200)]
ffmpeg: make -aspect work with -vcodec copy.
Nicolas George [Thu, 18 Apr 2013 10:52:20 +0000 (12:52 +0200)]
lavfi/vf_aspect: improve compatibility of parsing.
Try to accept both the old "num:den" and the new "num/den"
syntax. Fix "aspect=2" being ignored due to a missing den.
Also remove a duplicated #include.
Michael Niedermayer [Thu, 18 Apr 2013 18:15:44 +0000 (20:15 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
examples/filtering_audio: fix frame leak.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Apr 2013 17:53:00 +0000 (19:53 +0200)]
avcodec/mpegvideo_motion: Check P field references
If a reference is unavailable use a field from the current
picture
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 18 Apr 2013 15:54:54 +0000 (17:54 +0200)]
svq3: use memmove to avoid overlap in memcpy.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 15 Apr 2013 16:56:29 +0000 (16:56 +0000)]
colorchannelmixer filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 14 Apr 2013 22:16:51 +0000 (22:16 +0000)]
colorbalance filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Thu, 18 Apr 2013 13:15:22 +0000 (15:15 +0200)]
examples/filtering_audio: fix frame leak.
The frame is not used after being added to the filter
graph, there is no need to keep the reference.
Paul B Mahol [Thu, 18 Apr 2013 13:26:23 +0000 (13:26 +0000)]
lavu: add av_clipd_c
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 18 Apr 2013 14:19:10 +0000 (16:19 +0200)]
evrcdec: use memmove() instead of memcpy() when regions can overlap.
This occurs also with valid files.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 18 Apr 2013 13:29:44 +0000 (15:29 +0200)]
lavc/gif: avoid encoding 0x0 images.
It seems browsers don't like it very much.
Clément Bœsch [Thu, 18 Apr 2013 11:52:13 +0000 (13:52 +0200)]
lavf/gif: support only GIF codec.
Clément Bœsch [Thu, 18 Apr 2013 11:19:16 +0000 (13:19 +0200)]
lavf/gif: merge gif_write_{packet,video}.
Avoid a pointless split.
Clément Bœsch [Thu, 18 Apr 2013 11:01:56 +0000 (13:01 +0200)]
lavf/gif: trim unnecessarily long netscape ext code.
Extension description comments are now placed along the avio calls, the
always defined macro removed, and the always true loop_count check as
well (loop option is bound to 0-65535).
Clément Bœsch [Thu, 18 Apr 2013 10:55:04 +0000 (12:55 +0200)]
lavf/gif: remove unused fields.