]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 7 Jan 2013 00:24:32 +0000 (01:24 +0100)]
Merge commit '
9dbbda235d93d628777b986e502213f1ed390973 '
* commit '
9dbbda235d93d628777b986e502213f1ed390973 ':
vb: return meaningful error codes.
ptx: return meaningful error codes.
tiff: return meaningful error codes.
vqavideo: return meaningful error codes.
mss2: return meaningful error codes.
v210dec: return meaningful error codes
indeo2: cosmetics, reformat
Conflicts:
libavcodec/indeo2.c
libavcodec/tiff.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vqavideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jan 2013 00:11:14 +0000 (01:11 +0100)]
Merge commit '
7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8 '
* commit '
7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8 ':
indeo2: check decoding errors.
indeo2: return meaningful error codes
rl2: cosmetics, reformat
Conflicts:
libavcodec/rl2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Jan 2013 00:00:04 +0000 (01:00 +0100)]
Merge commit '
3c6e5a840c45fd3b832e86881602a72e47d46f19 '
* commit '
3c6e5a840c45fd3b832e86881602a72e47d46f19 ':
rl2: use fixed-width integer types where appropriate
rl2: return meaningful error codes.
cljr: return a meaningful error code.
fraps: cosmetics, reformat
Conflicts:
libavcodec/fraps.c
libavcodec/rl2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 23:38:25 +0000 (00:38 +0100)]
Merge commit '
57d11e5e28bfe0bc445ad78fc033aafa73068bb4 '
* commit '
57d11e5e28bfe0bc445ad78fc033aafa73068bb4 ':
fraps: return meaningful error codes.
kgv1dec: return meaningful error codes.
kmvc: return meaningful error codes.
wnv1: return meaningful error codes.
dpx: return meaningful error codes.
truemotion1: return meaningful error codes
pnm: return meaningful error codes.
Conflicts:
libavcodec/dpx.c
libavcodec/fraps.c
libavcodec/kmvc.c
libavcodec/pnm.c
libavcodec/pnmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 22:59:35 +0000 (23:59 +0100)]
Merge commit '
84f2847de394ac447f53306bd4dd73e1af6ea5e4 '
* commit '
84f2847de394ac447f53306bd4dd73e1af6ea5e4 ':
xl: return a meaningful error code.
xan: return a meaningful error code.
xxan: return meaningful error codes.
zmbv: return more meaningful error codes.
yop: use a meaningful error code.
c93: return meaningful error codes.
bmv: return meaningful error codes.
bmp: return meaningful error codes.
bink: operate with pointers to AVFrames instead of whole structs.
bink: return meaningful error codes.
bfi: return meaningful error codes.
bethsoftvideo: return meaningful error codes.
Conflicts:
libavcodec/c93.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 22:48:48 +0000 (23:48 +0100)]
Merge commit '
e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355 '
* commit '
e83c1e2d0bedb5d4fa9ab351126b2ecc552f1355 ':
avs: return meaningful error codes.
aura: return meaningful error codes.
asvdec: return meaningful error codes.
ansi: return a meaningful error code
anm: return meaningful error codes
aasc: return meaningful error codes.
8bps: return meaningful error codes.
4xm: operate with pointers to AVFrames instead of whole structs.
4xm: eliminate a pointless indirection
Conflicts:
libavcodec/4xm.c
libavcodec/aasc.c
libavcodec/anm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 22:41:19 +0000 (23:41 +0100)]
Merge commit '
aa15afb7ce850e2ac688efdef189df5da817a646 '
* commit '
aa15afb7ce850e2ac688efdef189df5da817a646 ':
4xm: simplify code with FFSWAP
4xm: return meaningful error codes
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 20:40:20 +0000 (21:40 +0100)]
MAINTAINERS: add 1.1, remove 0.10
If someone else wants to maintain a old release, please contact us
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 20:35:09 +0000 (21:35 +0100)]
RELEASE: 1.1.git for master
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 20:28:15 +0000 (21:28 +0100)]
Changelog, update for 1.1 release
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 18:15:16 +0000 (19:15 +0100)]
ff_get_audio_frame_size: try to fix wma in wav
Fixes Ticket1905, Ticket2114
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sun, 6 Jan 2013 17:40:50 +0000 (18:40 +0100)]
tests/fate/avfilter.mak: merge pp tests into GPL test list
The mp=pp filter was removed and replaced with a native implementation,
so the dependency on CONFIG_MP_FILTER stands no more.
Clément Bœsch [Sun, 6 Jan 2013 17:54:58 +0000 (18:54 +0100)]
lavfi/kerndeint: remove unused pixel_step.
Clément Bœsch [Sun, 6 Jan 2013 06:23:43 +0000 (07:23 +0100)]
lavfi/kerndeint: fix temp buffer linesize.
Also re-enable the FATE test.
Carl Eugen Hoyos [Sun, 6 Jan 2013 17:48:51 +0000 (18:48 +0100)]
Support decoding AC-3 in wav.
All known samples are actually ac3-in-spdif-in-wav, so use
the spdif demuxer to get the ac3 frames.
Carl Eugen Hoyos [Sun, 6 Jan 2013 16:55:14 +0000 (17:55 +0100)]
012v decoder.
The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.
rogerdpack [Wed, 26 Dec 2012 19:21:15 +0000 (12:21 -0700)]
add note on windows pipe
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 16:05:45 +0000 (17:05 +0100)]
doc/ffmpeg-resampler: Try to document async
Improvements welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 6 Jan 2013 15:38:24 +0000 (16:38 +0100)]
Support stereo as experimental feature in mmf / Yamaha SMAF.
Fixes ticket #1085.
Michael Niedermayer [Sun, 6 Jan 2013 14:07:19 +0000 (15:07 +0100)]
fate: disable kerndeint test
The filter has been added recently and does not yet pass tests on all platforms.
It should not be included in the tests in the release until it works.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 4 Jan 2013 20:18:57 +0000 (21:18 +0100)]
mxfenc: avoid depending on private codec structures and functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 4 Jan 2013 20:18:21 +0000 (21:18 +0100)]
dnxhd: Add avpriv_dnxhd_get_frame_size()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Jan 2013 13:09:33 +0000 (14:09 +0100)]
cos_tablegen: fix the lack on M_PI
We dont include mathematics.h as the headers get configured by config.h
for the target not the host.
Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Sat, 5 Jan 2013 14:29:13 +0000 (15:29 +0100)]
alsdec: Introduce failsafe switch to keep ALSSpecificConfig consistent to the input.
Reveiwed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Sun, 6 Jan 2013 11:14:53 +0000 (12:14 +0100)]
alsdec: Consistently use a period at the end of error messages.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sat, 17 Nov 2012 14:17:34 +0000 (15:17 +0100)]
vb: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 07:08:40 +0000 (08:08 +0100)]
indeo2: check decoding errors.
Anton Khirnov [Sat, 17 Nov 2012 06:40:45 +0000 (07:40 +0100)]
rl2: use fixed-width integer types where appropriate
Anton Khirnov [Sat, 17 Nov 2012 05:57:27 +0000 (06:57 +0100)]
fraps: return meaningful error codes.
Anton Khirnov [Fri, 16 Nov 2012 10:32:09 +0000 (11:32 +0100)]
xl: return a meaningful error code.
Anton Khirnov [Sat, 17 Nov 2012 12:46:51 +0000 (13:46 +0100)]
ptx: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 07:06:19 +0000 (08:06 +0100)]
indeo2: return meaningful error codes
Anton Khirnov [Sat, 17 Nov 2012 06:37:08 +0000 (07:37 +0100)]
rl2: return meaningful error codes.
Anton Khirnov [Fri, 16 Nov 2012 21:40:36 +0000 (22:40 +0100)]
kgv1dec: return meaningful error codes.
Anton Khirnov [Fri, 16 Nov 2012 05:36:15 +0000 (06:36 +0100)]
xan: return a meaningful error code.
Anton Khirnov [Sat, 17 Nov 2012 12:40:37 +0000 (13:40 +0100)]
tiff: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 06:45:05 +0000 (07:45 +0100)]
rl2: cosmetics, reformat
Anton Khirnov [Sat, 17 Nov 2012 06:32:09 +0000 (07:32 +0100)]
cljr: return a meaningful error code.
Anton Khirnov [Fri, 16 Nov 2012 21:36:10 +0000 (22:36 +0100)]
kmvc: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 07:35:45 +0000 (08:35 +0100)]
vqavideo: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 06:06:01 +0000 (07:06 +0100)]
fraps: cosmetics, reformat
Anton Khirnov [Fri, 16 Nov 2012 17:35:31 +0000 (18:35 +0100)]
wnv1: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 08:04:48 +0000 (09:04 +0100)]
mss2: return meaningful error codes.
Anton Khirnov [Fri, 16 Nov 2012 17:24:55 +0000 (18:24 +0100)]
dpx: return meaningful error codes.
Anton Khirnov [Sat, 17 Nov 2012 07:14:34 +0000 (08:14 +0100)]
v210dec: return meaningful error codes
Anton Khirnov [Fri, 16 Nov 2012 14:25:32 +0000 (15:25 +0100)]
truemotion1: return meaningful error codes
Anton Khirnov [Sat, 17 Nov 2012 07:11:30 +0000 (08:11 +0100)]
indeo2: cosmetics, reformat
Anton Khirnov [Fri, 16 Nov 2012 10:45:34 +0000 (11:45 +0100)]
pnm: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 15:09:39 +0000 (16:09 +0100)]
avs: return meaningful error codes.
Anton Khirnov [Tue, 13 Nov 2012 20:57:13 +0000 (21:57 +0100)]
4xm: simplify code with FFSWAP
Anton Khirnov [Fri, 16 Nov 2012 05:31:39 +0000 (06:31 +0100)]
xxan: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 14:11:23 +0000 (15:11 +0100)]
aura: return meaningful error codes.
Anton Khirnov [Tue, 13 Nov 2012 20:49:42 +0000 (21:49 +0100)]
4xm: return meaningful error codes
Anton Khirnov [Thu, 15 Nov 2012 17:18:12 +0000 (18:18 +0100)]
zmbv: return more meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 13:59:40 +0000 (14:59 +0100)]
asvdec: return meaningful error codes.
Anton Khirnov [Thu, 15 Nov 2012 19:49:17 +0000 (20:49 +0100)]
yop: use a meaningful error code.
Anton Khirnov [Wed, 14 Nov 2012 13:29:53 +0000 (14:29 +0100)]
ansi: return a meaningful error code
Anton Khirnov [Thu, 15 Nov 2012 09:29:28 +0000 (10:29 +0100)]
c93: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 13:01:50 +0000 (14:01 +0100)]
anm: return meaningful error codes
Anton Khirnov [Thu, 15 Nov 2012 09:10:13 +0000 (10:10 +0100)]
bmv: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 08:11:07 +0000 (09:11 +0100)]
aasc: return meaningful error codes.
Anton Khirnov [Thu, 15 Nov 2012 08:26:36 +0000 (09:26 +0100)]
bmp: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 07:59:03 +0000 (08:59 +0100)]
8bps: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 07:23:11 +0000 (08:23 +0100)]
bink: operate with pointers to AVFrames instead of whole structs.
This is more correct and avoids breaking extended_data.
Anton Khirnov [Wed, 14 Nov 2012 07:23:11 +0000 (08:23 +0100)]
4xm: operate with pointers to AVFrames instead of whole structs.
This is more correct and avoids breaking extended_data.
Anton Khirnov [Wed, 14 Nov 2012 20:47:37 +0000 (21:47 +0100)]
bink: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 07:09:01 +0000 (08:09 +0100)]
4xm: eliminate a pointless indirection
Anton Khirnov [Wed, 14 Nov 2012 15:09:39 +0000 (16:09 +0100)]
bfi: return meaningful error codes.
Anton Khirnov [Wed, 14 Nov 2012 15:09:39 +0000 (16:09 +0100)]
bethsoftvideo: return meaningful error codes.
Michael Niedermayer [Sun, 6 Jan 2013 12:20:14 +0000 (13:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 6 Jan 2013 05:51:22 +0000 (16:51 +1100)]
frmdec: reduce probe score to reflect test accuracy (and pass probetest)
Michael Niedermayer [Sun, 6 Jan 2013 03:12:20 +0000 (04:12 +0100)]
vf_tinterlace: fix logical/bit op mixup
Fixes CID966642
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 6 Jan 2013 03:36:42 +0000 (04:36 +0100)]
lavfi/kerndeint: get pix format description only once.
This makes the code faster.
Peter Ross [Sun, 6 Jan 2013 02:01:35 +0000 (13:01 +1100)]
fate: kerndeint requires gpl
Clément Bœsch [Sun, 6 Jan 2013 03:14:53 +0000 (04:14 +0100)]
lavfi/avfilter: remove now unused {src,cur,out}_buf.
This was supposed to be removed in
565e4993 , but it was delayed due to
the port of the remaining filters. These buffer ref pointers are not
used anymore, thus dropped.
Clément Bœsch [Sun, 6 Jan 2013 03:01:11 +0000 (04:01 +0100)]
lavc/subviewerdec: fix potential NULL deref.
Fixes CID966647
Peter Ross [Sun, 6 Jan 2013 02:58:15 +0000 (13:58 +1100)]
Megalux Frame demuxer
Michael Niedermayer [Sun, 6 Jan 2013 01:29:51 +0000 (02:29 +0100)]
fate: disable lavfi-histeq
The filter has been added recently and does not yet pass tests on all platforms.
It should not be included in the tests in the release until it works.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Jan 2013 01:27:22 +0000 (02:27 +0100)]
vf_kerndeint: memset buffer to avoid use of uninitialized memory.
This might fix fate failures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Sun, 6 Jan 2013 00:56:23 +0000 (01:56 +0100)]
tiffdec: Use the correct height field.
Fixes Ticket913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 5 Jan 2013 22:42:00 +0000 (23:42 +0100)]
10l: Update fate seeking reference after last commit.
Carl Eugen Hoyos [Sat, 5 Jan 2013 22:39:46 +0000 (23:39 +0100)]
mmf.c: Use LIBAVFORMAT_IDENT when writing Yamaha SMAF version information.
Michael Niedermayer [Sat, 5 Jan 2013 22:32:25 +0000 (23:32 +0100)]
libavfilter/video.h: remove unused things related to the start/slice/end API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Jan 2013 22:25:18 +0000 (23:25 +0100)]
internal.h: remove start/end_frame from AVFilterPad
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
内田佳久 [Sat, 5 Jan 2013 22:11:09 +0000 (23:11 +0100)]
mmf.c: Do not write metadata into the SMAF Contents Info chunk.
Justin Ruggles [Wed, 2 Jan 2013 18:34:48 +0000 (13:34 -0500)]
x86: lavr: use the x86inc.asm automatic stack alignment in mixing functions
CC:libav-stable@libav.org
Michael Niedermayer [Thu, 3 Jan 2013 16:13:16 +0000 (17:13 +0100)]
libspeexdec: fix terminator check
Fixes Ticket2096
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 5 Jan 2013 15:43:52 +0000 (12:43 -0300)]
MAINTAINERS: add myself as maintainer of lavf/astenc.c
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 5 Jan 2013 15:39:42 +0000 (12:39 -0300)]
astenc: Enable the loop flag only when needed
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 15 Dec 2012 19:46:33 +0000 (20:46 +0100)]
lavu: test for broken binutils on ARM
Some old gnu assemblers fail to assemble qdadd correctly
Ideally we should check this at build time, but better to
check at run time than mysteriously failing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 1 Jan 2013 15:04:15 +0000 (16:04 +0100)]
lavu/base64: return meaningful error code.
Carl Eugen Hoyos [Sat, 5 Jan 2013 13:40:06 +0000 (14:40 +0100)]
Allow remaining 32bit RGB packed pix_fmts in kerndeint filter.
Reviewed-by: Stefano Sabatini
Stefano Sabatini [Sat, 5 Jan 2013 13:03:40 +0000 (14:03 +0100)]
lavfi/kerndeint: fix mismatch between declared pixel format and test
+10l.
Michael Niedermayer [Sat, 5 Jan 2013 12:37:30 +0000 (13:37 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: fix NULL checking in sws_alloc_context()
mxfdec: fix NULL checking in mxf_get_sorted_table_segments()
finalize changelog for version 9
Conflicts:
Changelog
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 5 Jan 2013 12:27:59 +0000 (13:27 +0100)]
Merge commit '
b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a '
* commit '
b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a ':
Prepare for 9 Release.
Update release notes for the 9 release.
avprobe: also output dar/par if only defined in stream
Conflicts:
RELEASE
avprobe.c
doc/RELEASE_NOTES
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Fri, 4 Jan 2013 21:08:11 +0000 (22:08 +0100)]
lavfi/drawutils: fix blending computation in blend_line function
If width is not alligned with hsub, background component should only be
multiplied once by sub alpha component.
Michael Niedermayer [Sat, 5 Jan 2013 10:19:54 +0000 (11:19 +0100)]
lavu: check that assert level is defined
fix warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 29 Dec 2012 15:00:50 +0000 (15:00 +0000)]
w64dec: support metadata (summarylist guid)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 3 Jan 2013 18:37:32 +0000 (18:37 +0000)]
alsdec: change channel sorting so it match reference implementation
Read channel source instead of channel target for channel sorting.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stefano Sabatini [Sat, 20 Oct 2012 05:45:51 +0000 (07:45 +0200)]
lavfi: add histeq filter
This is a port of virtual dub's histogram equalization filter by Donald
A. Graft. Based on the work by Jérémy Tran <tran.jeremy.av@gmail.com>,
done for SOCIS 2012.