OSDN Git Service
Michael Niedermayer [Sat, 6 Jul 2013 20:05:35 +0000 (22:05 +0200)]
nutdec: use ff_find_last_ts()
Fixes finding the duration for nut files that are truncated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 19:52:07 +0000 (21:52 +0200)]
avformat/utils: factor ff_find_last_ts() out of ff_gen_search()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 6 Jul 2013 05:37:31 +0000 (05:37 +0000)]
replace some deprecated defines
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 6 Jul 2013 03:40:30 +0000 (03:40 +0000)]
lavfi/blend: use dual input helpers
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 6 Jul 2013 14:07:09 +0000 (16:07 +0200)]
avcodec/x86/cabac: Disable get_cabac_bypass_x86() on broken llvm/clang
This should fix fate on these platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 14:06:22 +0000 (16:06 +0200)]
avcodec/x86/cabac: factorize broken llvm/clang check out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 6 Jul 2013 07:34:13 +0000 (04:34 -0300)]
oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call
since there should not be more than one fisbone for a given stream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 6 Jul 2013 07:34:13 +0000 (04:34 -0300)]
oggparseskeleton: Fix fisbone header parsing
start_granule should be applied to the stream referenced in the fisbone packet, not to the
Skeleton stream.
This was broken in
d1f05dd18375f2f8e68372edee11436927e43ba8 and produced bogus warnings about
multiple fisbone in the same stream on files with more than one stream.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 2 Jul 2013 14:28:47 +0000 (16:28 +0200)]
examples/muxing: add support to audio resampling
Allows to encode to output in case the destination sample format is
different from AV_SAMPLE_FMT_S16.
Timothy Gu [Sat, 6 Jul 2013 03:37:18 +0000 (20:37 -0700)]
doc/encoders: add libopus encoder doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Sat, 6 Jul 2013 10:08:43 +0000 (12:08 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
bitstream_filter: K&R formatting cosmetics
Conflicts:
libavcodec/bitstream_filter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 03:34:36 +0000 (05:34 +0200)]
avformat/mp3dec: Add usetoc option to allow dlsabling the use of the xing TOC
The toc is inexact and not using it can thus make sense.
Using it is faster though, thus the opposite can similarly makes sense
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jul 2013 23:33:19 +0000 (01:33 +0200)]
tcp: Use a default timeout of 5 sec for opening a connection but not for receiving packets
This should be closer to how tcp behaved longer ago and should
fix the issue with idle connections timing out.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jul 2013 23:31:37 +0000 (01:31 +0200)]
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>
Michael Niedermayer [Fri, 5 Jul 2013 21:34:21 +0000 (23:34 +0200)]
tcp: Fix the default timeout
Fixes Ticket2694
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nigel Touati-Evans [Thu, 4 Jul 2013 15:51:32 +0000 (16:51 +0100)]
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>
Paul B Mahol [Sat, 1 Dec 2012 14:52:22 +0000 (14:52 +0000)]
ADPCM IMA WAV 2, 3 and 5 bits decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Fri, 5 Jul 2013 13:35:30 +0000 (15:35 +0200)]
bitstream_filter: K&R formatting cosmetics
Paul B Mahol [Thu, 4 Jul 2013 19:54:43 +0000 (19:54 +0000)]
get_bits: add get_bits_le()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Jean Delvare [Fri, 5 Jul 2013 12:26:36 +0000 (14:26 +0200)]
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>
Jean Delvare [Fri, 5 Jul 2013 12:25:06 +0000 (14:25 +0200)]
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>
Paul B Mahol [Fri, 5 Jul 2013 15:29:13 +0000 (15:29 +0000)]
lavfi/blackdetect: support 2 more pixels formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 5 Jul 2013 15:07:20 +0000 (15:07 +0000)]
lavfi/cropdetect: export cropdetect info to frame metadata
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Jean Delvare [Fri, 5 Jul 2013 08:32:57 +0000 (10:32 +0200)]
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>
Jean Delvare [Fri, 5 Jul 2013 08:23:18 +0000 (10:23 +0200)]
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>
Peter Große [Thu, 4 Jul 2013 17:02:21 +0000 (19:02 +0200)]
libavcodec: use 64bit counter in deprecated audio encoder API to prevent problems regarding negative dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jul 2013 10:50:02 +0000 (12:50 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
compat: wrap math.h to avoid AIX-specific clashes
Conflicts:
configure
See:
bf18abb2eb79c00c69f6f83ede64536e3297793c,
0915b531bc62440914710d2989813563b0446c5e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jul 2013 10:37:13 +0000 (12:37 +0200)]
Merge commit '
0420c810ceb430003f9f2793c5cfa1fe84657f3d'
* commit '
0420c810ceb430003f9f2793c5cfa1fe84657f3d':
log: pass the correct parameters to missing_feature_sample
Conflicts:
libavutil/log.c
See:
572e38a513139b21c35acfef13aa7c4e307ab648
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 5 Jul 2013 10:32:55 +0000 (12:32 +0200)]
doc/filters: clarify documentation for overlay repeatlast option
Suggested-By: Oliver Fromme <oliver@fromme.com>
Michael Niedermayer [Fri, 5 Jul 2013 10:23:13 +0000 (12:23 +0200)]
Michael Niedermayer [Fri, 5 Jul 2013 10:07:58 +0000 (12:07 +0200)]
Merge commit '
6dfacd7ab126aea1392949d1aa10fdc3d3eeb911'
* commit '
6dfacd7ab126aea1392949d1aa10fdc3d3eeb911':
indeo: Cosmetic formatting
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jul 2013 10:02:53 +0000 (12:02 +0200)]
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>
Michael Niedermayer [Fri, 5 Jul 2013 09:49:56 +0000 (11:49 +0200)]
Merge commit '
f6f36ca8ca1b2526d3abff7d7c627322d3bce912'
* commit '
f6f36ca8ca1b2526d3abff7d7c627322d3bce912':
indeo: Refactor ff_ivi_dec_huff_desc
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 5 Jul 2013 09:41:30 +0000 (11:41 +0200)]
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>
Stefano Sabatini [Wed, 26 Jun 2013 16:57:09 +0000 (18:57 +0200)]
lavc/avcodec.h: document bitstream filter API
Michael Niedermayer [Fri, 5 Jul 2013 01:27:07 +0000 (03:27 +0200)]
mpegts: only reopen pmt_cb filter if its different from the previous.
Fixes Ticket2632
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Thu, 4 Jul 2013 18:33:42 +0000 (20:33 +0200)]
lavf: fix documentation for avoid_negative_ts
Prefer "non-negative" over "positive", the former is more accurate.
Stefano Sabatini [Thu, 4 Jul 2013 17:30:21 +0000 (19:30 +0200)]
lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL
Michael Niedermayer [Thu, 4 Jul 2013 21:50:58 +0000 (23:50 +0200)]
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>
Michael Niedermayer [Thu, 4 Jul 2013 21:09:32 +0000 (23:09 +0200)]
avformat/movenc: allow negative TS for the ipod muxer
Fixes Ticket2708
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 4 Jul 2013 20:40:27 +0000 (20:40 +0000)]
configure: fix webp decoder dependency
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 4 Jul 2013 20:21:27 +0000 (22:21 +0200)]
avcodec/svq1enc: fix frame rotation code
Fixes Ticket2747
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 4 Jul 2013 20:17:38 +0000 (20:17 +0000)]
libstagefright: port to refcounted frames
Untested.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 4 Jul 2013 20:07:12 +0000 (20:07 +0000)]
libstagefright: unbreak compilation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Thu, 4 Jul 2013 19:53:08 +0000 (21:53 +0200)]
compat: wrap math.h to avoid AIX-specific clashes
AIX defines a class() function in its math.h header without any
guard.
Luca Barbato [Thu, 27 Jun 2013 01:17:32 +0000 (03:17 +0200)]
log: pass the correct parameters to missing_feature_sample
CC:libav-stable@libav.org
Matthieu Bouron [Thu, 4 Jul 2013 15:35:41 +0000 (17:35 +0200)]
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>
Michael Niedermayer [Sun, 30 Jun 2013 16:18:48 +0000 (18:18 +0200)]
mpegts: use ffio_ensure_seekback()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 16:18:13 +0000 (18:18 +0200)]
avformat/aviobuf: Add ffio_ensure_seekback()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 30 Jun 2013 16:15:50 +0000 (18:15 +0200)]
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>
Sean McGovern [Thu, 4 Jul 2013 16:02:17 +0000 (18:02 +0200)]
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>
Carl Eugen Hoyos [Thu, 4 Jul 2013 15:01:03 +0000 (17:01 +0200)]
Fix opacity and increase colour dynamics of initial vmd palette.
Zhang Rui [Thu, 4 Jul 2013 09:18:52 +0000 (17:18 +0800)]
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>
Luca Barbato [Wed, 3 Jul 2013 12:55:50 +0000 (14:55 +0200)]
indeo: reject negative array indexes
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 3 Jul 2013 12:01:32 +0000 (14:01 +0200)]
indeo: Cosmetic formatting
Trim some overly long lines.
Luca Barbato [Wed, 3 Jul 2013 11:59:16 +0000 (13:59 +0200)]
indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks
Spin large and mostly self contained blocks into stand alone
functions.
Luca Barbato [Wed, 3 Jul 2013 10:58:40 +0000 (12:58 +0200)]
indeo: Refactor ff_ivi_dec_huff_desc
Spare an indentation level.
Luca Barbato [Wed, 3 Jul 2013 09:18:30 +0000 (11:18 +0200)]
indeo: use a typedef for the mc function pointer
Jason Garrett-Glaser [Mon, 1 Jul 2013 19:06:22 +0000 (12:06 -0700)]
cabac: x86 version of get_cabac_bypass
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Paul B Mahol [Wed, 3 Jul 2013 21:05:42 +0000 (21:05 +0000)]
lavfi/crop: support more pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 4 Jul 2013 11:32:31 +0000 (13:32 +0200)]
avcodec/sonic: Fix usage of init_get_bits() and use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jul 2013 11:31:55 +0000 (13:31 +0200)]
avformat/h261dec: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jul 2013 11:30:40 +0000 (13:30 +0200)]
avcodec/svq1dec: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 4 Jul 2013 11:26:32 +0000 (13:26 +0200)]
avcodec/ra288: use init_get_bits8()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 25 Oct 2012 14:07:40 +0000 (14:07 +0000)]
riff: remove invalid fourcc 'exr '
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Kostya Shishkov [Wed, 3 Jul 2013 18:46:28 +0000 (20:46 +0200)]
aic: use chroma scan tables while decoding luma component in progressive mode
For some unclear reason Apple decided to use the same scan tables for luma and
chroma in the progressive mode while using different ones for luma in the
interlaced mode.
Carl Eugen Hoyos [Fri, 14 Jun 2013 00:08:31 +0000 (02:08 +0200)]
avcodec/rawdec: Fix 2bpp and 4bpp rawvideo in mov
Restores carefully the old behaviour
(and does not break decoding avi samples).
Fixes Ticket2536
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Tue, 2 Jul 2013 11:50:02 +0000 (13:50 +0200)]
lavfi/delogo: avoid propagation of rounding errors in chroma planes
When operating on subsampled chroma planes, some rounding is taking
place. The left and top borders are rounded down while the width and
height are rounded up, so all rounding is done outward to guarantee the
logo area is fully covered.
The problem is that the width and height are counted from the
unrounded left and top borders, respectively. So if the left or top
border position has indeed been rounded down, and the width or height
needs no rounding (up), the position of the the right or bottom border
will be effectively rounded down, i.e. inward.
The issue can easily be seen with a yuv240p input and
-vf delogo=45:45:60:40:show=1 -vframes 1 delogo-bug.png
(or virtually any logo area with odd x and y and even width and
height.) The right and bottom chroma borders (in green) are clearly
off.
In order to fix this, the width and height must be adjusted to include
the bits lost in the rounding of the left and top border positions,
respectively, prior to being themselves rounded up.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean Delvare [Mon, 1 Jul 2013 14:28:59 +0000 (16:28 +0200)]
lavfi/delogo: take SAR into account
When interpolating, weights are based on relative distances, which
assume square pixels. If a non-1:1 sample aspect ratio is used, it
should be taken into account when comparing distances, because the
human eye and brain care about the picture as it is displayed, not
stored.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 2 Jul 2013 13:31:28 +0000 (13:31 +0000)]
lavu/opt: show default values
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Matthieu Bouron [Sat, 29 Jun 2013 15:56:49 +0000 (17:56 +0200)]
lavf/movenc: fix writing of some iTunes metadata tag
Fix metadata display under iTunes for files using pgap, hdvd, stick,
tvsn and tves tags.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 14:42:20 +0000 (16:42 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
jpeg2000: Use the matching coding style struct for transform selection
jpeg2000: Merge rescaling with interleaving in 9/7 IDWT
No change, all commits & hunks where already in.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 14:36:05 +0000 (16:36 +0200)]
Merge commit '
22e18ea39e371030cc78973d1b46aae45a7ea215'
* commit '
22e18ea39e371030cc78973d1b46aae45a7ea215':
jpeg2000: Optimize output sample conversion
jpeg2000: Reset s->numX/Ytiles on tile deallocation
jpeg2000: Optimize dequantization
jpeg2000: Do not assume a single tile
jpeg2000: Speed up jpeg2000_decode_tile()
jpeg2000: Use EBCOT's CAUSAL and BYPASS mode in decode_cblk()
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 14:22:11 +0000 (16:22 +0200)]
Merge commit '
d57c737ac30cf079a342fa649fd4888c2d059dd9'
* commit '
d57c737ac30cf079a342fa649fd4888c2d059dd9':
jpeg2000: Simplify jpeg2000_decode_packets()
jpeg2000: Do not crash on NULL node in tag_tree_decode
jpeg2000: Refactor SOT marker parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 14:11:01 +0000 (16:11 +0200)]
Merge commit '
daeb4e3042f2ecae2d41aaa4cae0bed932539788'
* commit '
daeb4e3042f2ecae2d41aaa4cae0bed932539788':
jpeg2000: Proper cleanup on failure in decode_frame()
Conflicts:
libavcodec/jpeg2000.c
See:
9d56ccf5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:45:03 +0000 (15:45 +0200)]
Merge commit '
589e5b52f634f6b2d307a167a19eef7e7328cb08'
* commit '
589e5b52f634f6b2d307a167a19eef7e7328cb08':
jpeg2000: Use the correct sizeof in memset for T1 data
jpeg2000: Simplify init_tile()
jpeg2000: Update pixel format support
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:38:45 +0000 (15:38 +0200)]
Merge commit '
db13e02c6f0355fabd540e77b61ade127d6411ff'
* commit '
db13e02c6f0355fabd540e77b61ade127d6411ff':
jpeg2000: Compute corrections of sub-band coordinates
jpeg2000: Remove unneeded variable initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:30:05 +0000 (15:30 +0200)]
Merge commit '
5bf208f659703895df7926238dcfa8a8175de36b'
* commit '
5bf208f659703895df7926238dcfa8a8175de36b':
jpeg2000: Use separate fields for int and float codepaths
jpeg2000: Split int/float codepaths depending on the DWT
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:20:37 +0000 (15:20 +0200)]
Merge commit '
f9581f1414ec8e3e7d0868793cda4f2e4fa113ea'
* commit '
f9581f1414ec8e3e7d0868793cda4f2e4fa113ea':
jpeg2000: Improve reduced resolution decoding
jpeg2000: Compute quantization for 'scalar derived' in the correct case.
jpeg2000: Calculate code-block coord in ff_jpeg2000_init_component()
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 13:03:08 +0000 (15:03 +0200)]
Merge commit '
4cbd5ed11b0161a6a192174934b241e0cc0599a9'
* commit '
4cbd5ed11b0161a6a192174934b241e0cc0599a9':
jpeg2000: Fix compute precedence error in lut_gain index
jpeg2000: Initialize code blocks structures in precincts to 0
jpeg2000: Check that we have enough components for MCT
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:59:35 +0000 (14:59 +0200)]
Merge commit '
b564784a207b1395d2b5a41e580539df04651096'
* commit '
b564784a207b1395d2b5a41e580539df04651096':
jpeg2000: Check that there is a SOT before SOD
jpeg2000: Remove unneeded returns
Conflicts:
libavcodec/jpeg2000.c
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:49:28 +0000 (14:49 +0200)]
Merge commit '
ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f'
* commit '
ef35d6dbc6c3b7ba6b13ac13fc8e797cc1268c8f':
jpeg2000: Propagate error code from get_cox()
jpeg2000: Check that nreslevels2decode has been initialized before use
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:46:10 +0000 (14:46 +0200)]
Merge commit '
86a2602e16171ddc10c3ec655c23b16ffa595059'
* commit '
86a2602e16171ddc10c3ec655c23b16ffa595059':
jpeg2000: Drop unused and writeonly fields
jpeg2000: Correctly calculate sgnd
Conflicts:
libavcodec/jpeg2000.h
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:38:37 +0000 (14:38 +0200)]
Merge commit '
fd54dd028bc9f7bfb80ebf823a533dc84b73f936'
* commit '
fd54dd028bc9f7bfb80ebf823a533dc84b73f936':
jpeg2000: check len before parsing header
jpeg2000: Check component number in get_coc() and get_qcc()
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:30:17 +0000 (14:30 +0200)]
Merge commit '
17e5d614a8647d51b9795cb8bccf97ee33ca2d58'
* commit '
17e5d614a8647d51b9795cb8bccf97ee33ca2d58':
jpeg2000: Check zero bit-plane validity
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 12:20:36 +0000 (14:20 +0200)]
Merge commit '
7e201d575dc4385eb67314b0419d4d77185e65f4'
* commit '
7e201d575dc4385eb67314b0419d4d77185e65f4':
jpeg2000: Validate block lengthinc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 11:57:59 +0000 (13:57 +0200)]
Merge commit '
278a923c51187d37445d88a6b21082036ec9568d'
* commit '
278a923c51187d37445d88a6b21082036ec9568d':
jpeg2000: Validate SIZ parsing
Conflicts:
libavcodec/jpeg2000dec.c
This commit is not exactly merged due to bugs in it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 11:20:57 +0000 (13:20 +0200)]
Merge commit '
d3cb302b88503c3111e25add196622110c056188'
* commit '
d3cb302b88503c3111e25add196622110c056188':
jpeg2000: Validate SOT parsing
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 1 Jul 2013 23:39:14 +0000 (01:39 +0200)]
lavfi: create Libav-API compatibility layer for avfilter_graph_parse() at the next bump
Add function avfilter_graph_parse_ptr() and favor it in place of
avfilter_graph_parse(), which will be restored with the old/Libav
signature at the next bump.
If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the
Libav-compatible signature for avfilter_graph_parse().
At the next major bump the current implementation of
avfilter_graph_parse() should be dropped in favor of the Libav/old
implementation.
Should address trac ticket #2672.
Stefano Sabatini [Mon, 1 Jul 2013 16:47:09 +0000 (18:47 +0200)]
configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi
"Fork" is an ambiguous term, since there may be more than one fork, also
"fork" could be confused with the corresponding function. Also it seems
important to point the name of the referenced fork in the symbol.
Note: the old --enable-incompatible-fork-abi command is retained for
compatibility, although it should be considered deprecated.
Michael Niedermayer [Wed, 3 Jul 2013 11:00:57 +0000 (13:00 +0200)]
Merge commit '
57bc64e'
* commit '
57bc64e':
jpeg2000: Use bytestream2
jpeg2000: Clean up return paths and error messages
jpeg2000: Define the maximum decomposition levels
jpeg2000: Check code-block size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 10:59:59 +0000 (12:59 +0200)]
Revert "doc: add script to compute texi files dependencies"
This reverts commit
628ceac6526724d35cb390cc1f88344f4ea22eb4.
The commit broke out of tree builds
Michael Niedermayer [Wed, 3 Jul 2013 10:54:01 +0000 (12:54 +0200)]
Merge commit '
1a3598aae768465a8efc8475b6df5a8261bc62fc'
* commit '
1a3598aae768465a8efc8475b6df5a8261bc62fc':
jpeg2000: Use bytestream2
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 10:16:24 +0000 (12:16 +0200)]
Merge commit '
5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
* commit '
5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
jpeg2000: Clean up return paths and error messages
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 10:02:11 +0000 (12:02 +0200)]
Merge commit '
be3271009ef893fbed9640e8edbd771685fd957b'
* commit '
be3271009ef893fbed9640e8edbd771685fd957b':
jpeg2000: Define the maximum decomposition levels
Conflicts:
libavcodec/jpeg2000.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 3 Jul 2013 09:55:45 +0000 (11:55 +0200)]
Merge commit '
fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e'
* commit '
fbcc03db8f3919e2ea46d6ad11a00906b1c0ef0e':
jpeg2000: Check code-block size
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 25 Jun 2013 22:06:53 +0000 (00:06 +0200)]
examples/muxing: make more compact audio/video_time computation
Timothy Gu [Wed, 3 Jul 2013 02:32:27 +0000 (19:32 -0700)]
doc/muxers: Add AIFF doc
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Tue, 28 May 2013 19:52:33 +0000 (21:52 +0200)]
doc: add script to compute texi files dependencies
Replace the inline awk script with a Perl script which tracks the
dependencies recursively.
This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).
This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.
Michael Niedermayer [Wed, 3 Jul 2013 09:20:39 +0000 (11:20 +0200)]
Merge commit '
5650e331a733711b809bc27f968500f0f5530126'
* commit '
5650e331a733711b809bc27f968500f0f5530126':
jpeg2000: Validate resolution levels
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>