Michael Niedermayer
fde63146d2
Merge remote-tracking branch 'dwbuiten/master'
...
* dwbuiten/master:
w32threads: Make pthread_cond_wait follow POSIX
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 19:05:25 +02:00
Derek Buitenhuis
91dffb4c1d
w32threads: Make pthread_cond_wait follow POSIX
...
pthread_cond_wait is supposed to return an integer,
and indeed does sometimes. Fix its function declaration
to match its behavior and POSIX.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-04-04 13:04:38 -04:00
Derek Buitenhuis
6da08c9986
w32threads: Make pthread_cond_wait follow POSIX
...
pthread_cond_wait is supposed to return an integer,
and indeed does sometimes. Fix its function declaration
to match its behavior and POSIX.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-04-04 13:02:34 -04:00
Michael Niedermayer
ca26c2c30f
lavf: add mp1/2 to determinable_frame_size()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 18:21:37 +02:00
Michael Niedermayer
c22fd9bd9c
allcodecs: move libaacplus down.
...
We choose the first encoder by default and libaccplus has a
quite limited set of supported bitrates/sample rates.
Thus leading to failure by default in many cases when it is
enabled at compile time.
Moving it down means that the other aac encoders are favored
by default which avoids this issue.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 17:44:21 +02:00
Tomas Härdin
a61fada380
mxfdec: Fix regression on files from Pinnacle Thunder
...
The reason for this is that such files have IndexTableSegments which when parsed
cover EditUnit ranges like this:
[0,1)
[249,250)
[249,377)
[0,249)
where each interval is [IndexStartPosition,IndexStartPosition+IndexDuration).
This would be reduced to a sparse index like:
[0,1), [249,250)
instead of the full range:
[0,249), [249,377)
See TimeCode_HD.mxf, UMID =
060a2b340101010101010410130000000004001aa0e59175025b2a5600da4101.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 17:43:17 +02:00
Michael Niedermayer
6fb35dbad1
vf_idet: print accumulated statistics at end
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 16:31:31 +02:00
Michael Niedermayer
baf0c79a4d
vf_idet: set interlaced flags
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 16:27:24 +02:00
Michael Niedermayer
2941a937f2
vf_idet: fix indention
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 16:22:01 +02:00
Michael Niedermayer
5d9cfd8726
vf_idet: move statistic variables into the context
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 16:22:01 +02:00
Michael Niedermayer
02567bd73c
vf_idet: remove unused function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 16:22:01 +02:00
Michael Niedermayer
398491ae01
vf_idet: pass context to av_log()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 16:22:01 +02:00
Nicolas George
6c7b5b7b33
vf_ass: use drawutils.
2012-04-04 16:16:10 +02:00
Nicolas George
a63712d37c
vf_drawtext: use drawutils.
2012-04-04 16:16:10 +02:00
Nicolas George
e8497a338e
drawutils: implement uniform and mask blending.
2012-04-04 16:16:09 +02:00
Michael Niedermayer
e3e89b6d8b
libavfilter: Add interlace detect filter.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 15:27:30 +02:00
Nicolas George
12292f35a3
v4l2: allow to convert monotonic timestamps.
2012-04-04 15:22:44 +02:00
Diego Biurrun
3dde147ff9
cosmetics: Consistently place static, inline and av_cold attributes/keywords.
2012-04-04 14:54:13 +02:00
Diego Biurrun
d4f05ae3b6
sbrdsp: Use standard multiple inclusion guards.
2012-04-04 14:54:11 +02:00
Nicolas George
8a9ae37fee
timefilter: allow to evaluate at other times.
2012-04-04 14:32:44 +02:00
Aneesh Dogra
6d21f49879
pcm: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-04-04 14:14:28 +02:00
Clément Bœsch
e29f66d64a
ffmpeg: fix a few typo.
2012-04-04 11:50:16 +02:00
Michael Niedermayer
a4e359a3f9
mpeg4: dont reset picture_num for xvid
...
Fixes Ticket1162
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 04:19:43 +02:00
Michael Niedermayer
3360b8517a
h264: fix seeking in low delay streams without IDR
...
Fixes Ticket1165
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 03:43:23 +02:00
Michael Niedermayer
41a097aada
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Unscaled Planar RGB -> RGB support in swscale.
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-04 01:14:45 +02:00
Michael Niedermayer
ae3ee72e02
lavf: print some more things in TS debug statements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 23:46:23 +02:00
Michael Niedermayer
b5d433d306
lavf: increase RELATIVE_TS_BASE
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 23:46:23 +02:00
Piotr Bandurski
835a893bcb
rawdec: Support fourccs YV16 and YV24
2012-04-03 15:48:53 -04:00
Raffaele Sena
34d908c083
rtmp: implement bandwidth notification
...
Improve compatibility with some servers.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-04-03 12:37:31 -07:00
Samuel Pitoiset
faba4a9b88
rtmp: update supported audio codecs value
...
The audio codecs property is composed by all values except
SUPPORT_SND_INTEL (0x0008) and SUPPORT_SND_UNUSED (0x0010) which are
unused.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-04-03 12:24:33 -07:00
Clément Bœsch
588eaa106d
swfdec: support compressed swf.
2012-04-03 19:12:52 +02:00
Hans-Kristian Arntzen
b991b300f2
Unscaled Planar RGB -> RGB support in swscale.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-04-03 13:06:42 -04:00
Michael Niedermayer
38477e1981
vf_lut: avoid rgb component indexing in the inner loop
...
15k->10k cpu cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 18:30:07 +02:00
Michael Niedermayer
002d9ded4a
vf_lut: optimize rgb codepath
...
19k -> 15k cpu cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 18:13:33 +02:00
Michael Niedermayer
79a1d98676
vf_lut: optimize planar case
...
2500 -> 1900 cpu cycles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 17:49:04 +02:00
Tomas Härdin
24e90d0c05
mxfenc: Don't allow muxing audio-only since it's not supported
...
This fixes muxing audio-only output resulting in SIGFPE due to lack of EditRate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 10:11:27 +02:00
Michael Niedermayer
b61e596a14
asf: remove duplicated index_guid
...
Found-by:ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 09:46:52 +02:00
Michael Niedermayer
cfd64eec4e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
FATE: Add RALF decoding test
Conflicts:
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-03 00:10:19 +02:00
Michael Niedermayer
3c480f8a6c
h264: fix incompatible pointer type warnings.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 22:05:42 +02:00
Michael Niedermayer
11bc558070
mpegts: fix a unused function warning
...
note the function is used under #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 21:33:42 +02:00
Michael Niedermayer
e0541c7b5e
dct-test: fix incompatible pointer types warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 21:26:08 +02:00
Michael Niedermayer
183c3fa48a
des: Fix half a dozen warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 21:23:56 +02:00
Matthieu Bouron
2663540821
ffmpeg: affect source stream index in new_output_stream function
...
Fix map_channel when mapped audio stream index is greater than 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 17:27:09 +02:00
Michael Niedermayer
1e059731a3
movenc: fix segfault with chapter tracks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 17:00:20 +02:00
Michael Niedermayer
c450cf1572
libavcodec: be less picky on nonsense rc_max_rate / rc_buffer_size combinations.
...
Some applications use these combinations and to maintain ABI
compatibility with previous versions we should not suddenly
fail. Thus only display a warning for the newly detected cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 02:58:08 +02:00
Michael Niedermayer
49891784ce
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vsrc_buffer: allow buffering arbitrary number of frames.
vf_scale: avoid a pointless memcpy in no-op conversion.
avfiltergraph: try to reduce format conversions in filters.
avfiltergraph: add an AVClass to AVFilterGraph on next major bump.
id3v2: fix skipping extended header in id3v2.4
Conflicts:
libavfilter/vf_scale.c
libavfilter/vsrc_buffer.c
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-02 00:17:02 +02:00
Michael Niedermayer
178f75a5ae
snow-test: fix pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-01 22:28:24 +02:00
Michael Niedermayer
5ef5c02354
swr-test: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-01 22:24:06 +02:00
Michael Niedermayer
6e1b0cdad9
fft-test: fix all pointer type warnings.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-01 22:19:45 +02:00
Michael Niedermayer
87688727e4
swr: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-01 22:11:34 +02:00