Michael Niedermayer
efa9e6b423
ff_network_wait_fd_timeout: do not break with timeout < 0
...
Most code treats timeout < 0 like 0 already
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06 01:31:37 +02:00
Michael Niedermayer
390aabb2a1
tcp: Fix the default timeout
...
Fixes Ticket2694
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06 00:17:31 +02:00
Nigel Touati-Evans
ef8cc06d6e
avformat/avidec: Fix incorrect detection of badly interleaved avi
...
The method guess_ni_flag needs to divide timestamps in the index
by sample_size if it is set in order to compare different streams correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 22:07:48 +02:00
Paul B Mahol
6516a25f04
ADPCM IMA WAV 2, 3 and 5 bits decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-05 18:10:27 +00:00
Paul B Mahol
48f2750de8
get_bits: add get_bits_le()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-05 16:51:08 +00:00
Jean Delvare
4e10d87f38
lavfi/delogo: band width must be at least 1
...
We need at least one pixel around the logo to use as known points to
interpolate from. So properly declare the band/t attribute has having
a minimum value of 1.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 18:02:11 +02:00
Jean Delvare
72abce3c46
lavfi/delogo: option show shouldn't affect band
...
Options "show" and "band" are unrelated and should thus be
independent. However, setting "show" to 1 currently resets "band" to
its default value of 4. While this is documented, this still
surprising and confusing IMHO.
Change this behavior and make "show" and "band" independent from each
other. Update the documentation accordingly.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 18:02:11 +02:00
Paul B Mahol
413f865a9a
lavfi/blackdetect: support 2 more pixels formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-05 15:30:37 +00:00
Paul B Mahol
9dd1447788
lavfi/cropdetect: export cropdetect info to frame metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-05 15:07:33 +00:00
Jean Delvare
4e8d6b315c
lavfi/delogo: remember left and right samples when interpolating
...
The left and right samples are the same for the whole line, so store
their values and don't recompute them for every iteration of "y".
This simple optimization results in a speed improvement between 15%
and 20% in my tests (depending on the logo geometry.)
Result is obviously the same.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 13:53:37 +02:00
Jean Delvare
6fc8c4cc0e
lavfi/delogo: don't recompute the same difference again and again
...
The top left hand corner pixel coordinates are already stored in
logo_x1 and logo_y1 so don't recompute each of them 6 times for every
iteration.
This is a simple code optimization, result is obviously the same. The
performance gain is small (about 2% in my tests) but still good to
have, and the new code is clearer.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by; Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 13:52:59 +02:00
Peter Große
c6c2231227
libavcodec: use 64bit counter in deprecated audio encoder API to prevent problems regarding negative dts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 13:40:13 +02:00
Michael Niedermayer
47ca9f041c
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
compat: wrap math.h to avoid AIX-specific clashes
Conflicts:
configure
See: bf18abb2eb
, 0915b531bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 13:11:06 +02:00
Michael Niedermayer
8fdec02fd1
Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'
...
* commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d':
log: pass the correct parameters to missing_feature_sample
Conflicts:
libavutil/log.c
See: 572e38a513
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 12:43:57 +02:00
Stefano Sabatini
d880b2bdff
doc/filters: clarify documentation for overlay repeatlast option
...
Suggested-By: Oliver Fromme <oliver@fromme.com>
2013-07-05 12:35:12 +02:00
Michael Niedermayer
9f89bebb7b
Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'
...
* commit '6a10142faa1cca8ba2bfe51b970754f62d60f320':
indeo: reject negative array indexes
Conflicts:
libavcodec/ivi_common.c
See: 93927eb334
, a93c7ca6ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 12:26:25 +02:00
Michael Niedermayer
7d3b55c6a4
Merge commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911'
...
* commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911':
indeo: Cosmetic formatting
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 12:08:22 +02:00
Michael Niedermayer
9b10440dcd
Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'
...
* commit '62256010e9bc8879e2bf7f3b94af8ff85e239082':
indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 12:02:53 +02:00
Michael Niedermayer
0e2056056f
Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'
...
* commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912':
indeo: Refactor ff_ivi_dec_huff_desc
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 11:50:46 +02:00
Michael Niedermayer
cced6f4d58
Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'
...
* commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb':
indeo: use a typedef for the mc function pointer
cabac: x86 version of get_cabac_bypass
aic: use chroma scan tables while decoding luma component in progressive mode
Conflicts:
libavcodec/aic.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 11:41:30 +02:00
Stefano Sabatini
0f85c96091
lavc/avcodec.h: document bitstream filter API
2013-07-05 11:03:56 +02:00
Michael Niedermayer
b009267910
mpegts: only reopen pmt_cb filter if its different from the previous.
...
Fixes Ticket2632
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-05 04:02:02 +02:00
Stefano Sabatini
d06ae0d791
lavf: fix documentation for avoid_negative_ts
...
Prefer "non-negative" over "positive", the former is more accurate.
2013-07-05 00:58:03 +02:00
Stefano Sabatini
41fe750f4b
lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL
2013-07-05 00:58:03 +02:00
Michael Niedermayer
46ad287a2a
avutil/rational: avoid llrint() and rint()
...
This should workaround issues with these functions on ia64 and sparc64
Fixes Ticket2713
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 23:50:58 +02:00
Michael Niedermayer
65abce67b5
avformat/movenc: allow negative TS for the ipod muxer
...
Fixes Ticket2708
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 23:14:31 +02:00
Paul B Mahol
35b02732b9
configure: fix webp decoder dependency
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-04 20:41:54 +00:00
Michael Niedermayer
cb678cc2cf
avcodec/svq1enc: fix frame rotation code
...
Fixes Ticket2747
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 22:22:04 +02:00
Paul B Mahol
d1c96b28d7
libstagefright: port to refcounted frames
...
Untested.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-04 20:17:38 +00:00
Paul B Mahol
dda8afc391
libstagefright: unbreak compilation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-04 20:07:12 +00:00
Luca Barbato
d3635f3ab0
compat: wrap math.h to avoid AIX-specific clashes
...
AIX defines a class() function in its math.h header without any
guard.
2013-07-04 21:54:32 +02:00
Luca Barbato
0420c810ce
log: pass the correct parameters to missing_feature_sample
...
CC:libav-stable@libav.org
2013-07-04 21:25:11 +02:00
Matthieu Bouron
621ab4e4ef
lavf/movenc: check ff_mov_init_hinting() return
...
Fixes a crash when the codec stream is not supported by the rtp muxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 19:51:40 +02:00
Michael Niedermayer
8a8d9a7385
mpegts: use ffio_ensure_seekback()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 19:13:39 +02:00
Michael Niedermayer
186ec17843
avformat/aviobuf: Add ffio_ensure_seekback()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 19:13:38 +02:00
Michael Niedermayer
2ca48e4666
avformat: Append data in fill_buffer() when possible
...
Data is appended in fill_buffer() when there is sufficient space left
and the data pointer only reset when needed.
Previously the data pointer was more often reset, loosing more seekback
space than otherwise needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 19:13:38 +02:00
Sean McGovern
bf18abb2eb
Rename "AVClass class" as "AVClass component_class" for external codecs.
...
The aix header math.h defines "extern int class()" for C.
This fixes compilation on aix with external libraries enabled.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2013-07-04 18:02:17 +02:00
Carl Eugen Hoyos
f32b8130f4
Fix opacity and increase colour dynamics of initial vmd palette.
2013-07-04 18:01:08 +02:00
Zhang Rui
4a4c93cb3f
avformat/http: support relative url redirection
...
see also http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-17#section-9.5
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 16:16:03 +02:00
Luca Barbato
6a10142faa
indeo: reject negative array indexes
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-04 16:06:11 +02:00
Luca Barbato
6dfacd7ab1
indeo: Cosmetic formatting
...
Trim some overly long lines.
2013-07-04 16:06:10 +02:00
Luca Barbato
62256010e9
indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks
...
Spin large and mostly self contained blocks into stand alone
functions.
2013-07-04 16:06:10 +02:00
Luca Barbato
f6f36ca8ca
indeo: Refactor ff_ivi_dec_huff_desc
...
Spare an indentation level.
2013-07-04 16:06:10 +02:00
Luca Barbato
e6d8acf6a8
indeo: use a typedef for the mc function pointer
2013-07-04 16:06:10 +02:00
Jason Garrett-Glaser
d222f6e39e
cabac: x86 version of get_cabac_bypass
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-07-04 16:06:10 +02:00
Paul B Mahol
253e155251
lavfi/crop: support more pixel formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-04 11:46:06 +00:00
Michael Niedermayer
6d05039c7e
avcodec/sonic: Fix usage of init_get_bits() and use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 13:40:08 +02:00
Michael Niedermayer
b237e6282e
avformat/h261dec: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 13:40:08 +02:00
Michael Niedermayer
8c707a129a
avcodec/svq1dec: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 13:40:08 +02:00
Michael Niedermayer
df6acc81a8
avcodec/ra288: use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-04 13:40:08 +02:00