Michael Niedermayer
55d8cac254
Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'
...
* commit '6689474b91049411b5b7986616d1c66b701ae11f':
v210x: return meaningful error codes.
r210dec: return meaningful error codes.
vb: cosmetics, reformat
Conflicts:
libavcodec/vb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07 01:30:23 +01:00
Michael Niedermayer
501db2f32b
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>
2013-01-07 01:24:32 +01:00
Michael Niedermayer
4b20d307b3
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>
2013-01-07 01:11:14 +01:00
Michael Niedermayer
d30660306c
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>
2013-01-07 01:01:13 +01:00
Michael Niedermayer
07f22d0b49
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>
2013-01-07 00:41:06 +01:00
Michael Niedermayer
7b018e5c8d
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>
2013-01-06 23:59:35 +01:00
Michael Niedermayer
6190446745
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>
2013-01-06 23:48:48 +01:00
Michael Niedermayer
a2aeaff40f
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>
2013-01-06 23:41:19 +01:00
Michael Niedermayer
58edabb198
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>
2013-01-06 21:42:35 +01:00
Michael Niedermayer
d46fca4b75
RELEASE: 1.1.git for master
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 21:42:35 +01:00
Michael Niedermayer
6270564abc
Changelog, update for 1.1 release
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 21:28:15 +01:00
Michael Niedermayer
2713e43ac8
ff_get_audio_frame_size: try to fix wma in wav
...
Fixes Ticket1905, Ticket2114
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 19:46:04 +01:00
Stefano Sabatini
b3d814753c
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.
2013-01-06 19:04:24 +01:00
Clément Bœsch
caee85bbce
lavfi/kerndeint: remove unused pixel_step.
2013-01-06 18:59:15 +01:00
Clément Bœsch
f6659e5c5e
lavfi/kerndeint: fix temp buffer linesize.
...
Also re-enable the FATE test.
2013-01-06 18:59:15 +01:00
Carl Eugen Hoyos
1ae9d2820e
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.
2013-01-06 18:48:51 +01:00
Carl Eugen Hoyos
9ff92cf195
012v decoder.
...
The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.
2013-01-06 17:59:27 +01:00
rogerdpack
40648d8cc3
add note on windows pipe
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 17:47:49 +01:00
Michael Niedermayer
f6ef62eb7f
doc/ffmpeg-resampler: Try to document async
...
Improvements welcome!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 17:47:49 +01:00
Carl Eugen Hoyos
9ffe790afc
Support stereo as experimental feature in mmf / Yamaha SMAF.
...
Fixes ticket #1085 .
2013-01-06 16:38:24 +01:00
Michael Niedermayer
631ec0642d
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>
2013-01-06 15:08:38 +01:00
Michael Niedermayer
8214c1d82c
mxfenc: avoid depending on private codec structures and functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 14:08:08 +01:00
Michael Niedermayer
3db02b83e7
dnxhd: Add avpriv_dnxhd_get_frame_size()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:58:46 +01:00
Michael Niedermayer
11e1466b43
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>
2013-01-06 13:56:55 +01:00
Thilo Borgmann
bfde6e5c02
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>
2013-01-06 13:55:58 +01:00
Thilo Borgmann
95f81159de
alsdec: Consistently use a period at the end of error messages.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 13:52:53 +01:00
Anton Khirnov
6689474b91
v210x: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
9dbbda235d
vb: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
7b1fbd4729
indeo2: check decoding errors.
2013-01-06 13:31:40 +01:00
Anton Khirnov
3c6e5a840c
rl2: use fixed-width integer types where appropriate
2013-01-06 13:31:40 +01:00
Anton Khirnov
57d11e5e28
fraps: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
84f2847de3
xl: return a meaningful error code.
2013-01-06 13:31:40 +01:00
Anton Khirnov
39039f2405
r210dec: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
a0ffcee1ee
ptx: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
6ea2c9a4cf
indeo2: return meaningful error codes
2013-01-06 13:31:40 +01:00
Anton Khirnov
126abaaaae
rl2: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
405486c28b
kgv1dec: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
d47dabbac2
xan: return a meaningful error code.
2013-01-06 13:31:40 +01:00
Anton Khirnov
4324a3ce75
vb: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
b2a7b81b9c
tiff: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
6781b5315e
rl2: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
7c8fceef6c
cljr: return a meaningful error code.
2013-01-06 13:31:40 +01:00
Anton Khirnov
e1a7061d63
kmvc: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
26a161a166
vqavideo: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
80344261aa
fraps: cosmetics, reformat
2013-01-06 13:31:40 +01:00
Anton Khirnov
f3fcb1a7b2
wnv1: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
edfe05ddf1
mss2: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
0c19b23bd5
dpx: return meaningful error codes.
2013-01-06 13:31:40 +01:00
Anton Khirnov
f0547c9bd0
v210dec: return meaningful error codes
2013-01-06 13:31:40 +01:00
Anton Khirnov
b61e0b99df
truemotion1: return meaningful error codes
2013-01-06 13:31:40 +01:00