OSDN Git Service
Michael Niedermayer [Mon, 8 Jul 2013 03:10:06 +0000 (05:10 +0200)]
Merge commit '
76efedeadb1f6bf79020c44a71dd0cee13d932ad'
* commit '
76efedeadb1f6bf79020c44a71dd0cee13d932ad':
qdm2: formatting cosmetics
Conflicts:
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 03:02:52 +0000 (05:02 +0200)]
Merge commit '
f054e309c58894450a5d18cce9799ef58aab9f14'
* commit '
f054e309c58894450a5d18cce9799ef58aab9f14':
qdm2: use init_static_data
westwood_vqa: do not free extradata on error in read_header
Conflicts:
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 02:48:39 +0000 (04:48 +0200)]
Merge commit '
c4abc9098cacb227dba39bac6aea16b2bceba0d0'
* commit '
c4abc9098cacb227dba39bac6aea16b2bceba0d0':
vqavideo: check the version
Conflicts:
libavcodec/vqavideo.c
See:
b226af39107f09cd650875388250f4968eea54db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 02:34:11 +0000 (04:34 +0200)]
Merge commit '
636ced8e1dc8248a1353b416240b93d70ad03edb'
* commit '
636ced8e1dc8248a1353b416240b93d70ad03edb':
cmdutils: wrap exit explicitly
Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 02:08:07 +0000 (04:08 +0200)]
Merge commit '
21732063a346475eb22c332b27e8216b79f9ad4a'
* commit '
21732063a346475eb22c332b27e8216b79f9ad4a':
movenc: K&R formatting cosmetics
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 01:41:33 +0000 (03:41 +0200)]
Merge commit '
38e9585de993c32899588ab037180f2c930ce74c'
* commit '
38e9585de993c32899588ab037180f2c930ce74c':
Makefile: Remove stray tabs
vp8: Wait for prev_frame to parse segment_map before reading it
yuv4mpeg: Correctly round chroma up for odd luma sizes
rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
avio: Handle AVERROR_EOF in the same way as the return value 0
Conflicts:
libavformat/rmdec.c
libavformat/yuv4mpeg.c
No change as all the commits where already in before
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 8 Jul 2013 00:19:28 +0000 (02:19 +0200)]
avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases
This fixes speex in rtmp
Fixes Ticket2409
the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration
If this causes any problems, like premature analyze/probe end, please report!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 7 Jul 2013 23:50:54 +0000 (23:50 +0000)]
zmbvenc: remove unused AVFrame from encoder private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 7 Jul 2013 23:45:17 +0000 (23:45 +0000)]
zmbvenc: do not set avctx->coded_frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 7 Jul 2013 23:06:06 +0000 (23:06 +0000)]
gif: remove unused AVFrame from encoder private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 7 Jul 2013 22:56:21 +0000 (22:56 +0000)]
gif: do not set avctx->coded_frame
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Luca Barbato [Thu, 27 Jun 2013 00:49:15 +0000 (02:49 +0200)]
qdm2: formatting cosmetics
Apply the usual style plus drop few unnecessary return at the end
of void functions.
Luca Barbato [Thu, 27 Jun 2013 00:20:59 +0000 (02:20 +0200)]
qdm2: use init_static_data
Luca Barbato [Thu, 27 Jun 2013 02:30:20 +0000 (04:30 +0200)]
westwood_vqa: do not free extradata on error in read_header
The extradata is already freed by avformat_open_input on
failure.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Thu, 27 Jun 2013 01:19:05 +0000 (03:19 +0200)]
vqavideo: check the version
Prevent out of buffer write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Sat, 6 Jul 2013 23:52:51 +0000 (01:52 +0200)]
cmdutils: wrap exit explicitly
Some C runtime implementations deadlock when calling threading functions
on the atexit() handler.
Use a simpler wrapper similar to av_log to call the cleanup function
before exit.
Bug-Id: 523
Martin Storsjö [Sun, 7 Jul 2013 11:59:47 +0000 (14:59 +0300)]
movenc: K&R formatting cosmetics
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 7 Jul 2013 09:56:02 +0000 (11:56 +0200)]
Makefile: Remove stray tabs
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sun, 23 Jun 2013 04:16:11 +0000 (21:16 -0700)]
vp8: Wait for prev_frame to parse segment_map before reading it
This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Mon, 24 Jun 2013 23:13:58 +0000 (19:13 -0400)]
yuv4mpeg: Correctly round chroma up for odd luma sizes
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 1 Jul 2013 21:38:08 +0000 (23:38 +0200)]
rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
This fixes crashes when playing back certain RealRTSP streams.
When invoked from the RTP depacketizer, the full realmedia
demuxer isn't invoked, but only certain functions from it, where
a separate AVIOContext is passed in as parameter (for the buffer
containing the data to parse). The functions called from within
those entry points should only be using that parameter, not
s->pb. In the depacketizer case, s is the RTSP context, where ->pb
is null.
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 24 Jun 2013 12:23:44 +0000 (14:23 +0200)]
avio: Handle AVERROR_EOF in the same way as the return value 0
This makes sure the ffurl_read_complete function actually
returns the number of bytes read, as the documentation of the
function says, even if the underlying protocol uses AVERROR_EOF
instead of 0.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Mon, 24 Jun 2013 16:12:24 +0000 (18:12 +0200)]
wtv: Mark attachment with a negative stream id
A sid 0 would be mismatched to the attachment.
Prevent NULL pointer dereference.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Fri, 21 Jun 2013 12:47:01 +0000 (14:47 +0200)]
avprobe: rename the prettyprint structures
Paul B Mahol [Sat, 6 Jul 2013 16:30:11 +0000 (16:30 +0000)]
dxa: make code independent of sizeof(AVFrame)
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 7 Jul 2013 16:39:07 +0000 (18:39 +0200)]
mmsh: reimplement seeking
Fixes Ticket2682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 13:03:12 +0000 (15:03 +0200)]
avformat_find_stream_info: use fps_dts as last resort to determine duration
Fixes long delay with some hardware generated h264 in ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 10:50:41 +0000 (12:50 +0200)]
avformat/mp3dec: read TOC even if not all needed information is available
This fixes hyothetical bugs with parsing of elements after the TOC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 10:37:07 +0000 (12:37 +0200)]
avformat/mp3dec: read xing toc independant of usetoc, only skip filling index if requested
Fixes hypothetical parsing bug with -usetoc 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:56:02 +0000 (11:56 +0200)]
avformat/Makefile: remove stray tab
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:48:05 +0000 (11:48 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Mark attachment with a negative stream id
Conflicts:
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:35:59 +0000 (11:35 +0200)]
Merge commit '
a4baf96abd64cda68e3e4692b182bdf60745a14d'
* commit '
a4baf96abd64cda68e3e4692b182bdf60745a14d':
avprobe: rename the prettyprint structures
tools: Wording and formatting cosmetics
Conflicts:
avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 09:26:28 +0000 (11:26 +0200)]
Merge commit '
6516632967da5e6bd7d6136e8678f826669ed26e'
* commit '
6516632967da5e6bd7d6136e8678f826669ed26e':
tests: Only run noproxy test if networking is enabled
fifo: K&R formatting cosmetics
Conflicts:
libavformat/Makefile
libavutil/fifo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 08:59:19 +0000 (10:59 +0200)]
Merge commit '
4e7f0b082d8c4b360312216b9241bec65ff63b35'
* commit '
4e7f0b082d8c4b360312216b9241bec65ff63b35':
kmvc: Clip pixel position to valid range
The added clip should make no difference, there are already checks for
the index.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 08:53:20 +0000 (10:53 +0200)]
Merge commit '
8f689770548c86151071ef976cf9b6998ba21c2a'
* commit '
8f689770548c86151071ef976cf9b6998ba21c2a':
kmvc: use fixed sized arrays in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 7 Jul 2013 00:42:40 +0000 (02:42 +0200)]
avformat/mov: Fix duration of fragmented mov
Fixes Ticket2757
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 23:39:43 +0000 (01:39 +0200)]
dct_unquantize_h263_intra_c: fix assert condition
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 23:29:48 +0000 (01:29 +0200)]
libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE
should fix ticket2755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 23:29:18 +0000 (01:29 +0200)]
avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 6 Jul 2013 21:53:19 +0000 (23:53 +0200)]
oggparseskeleton: avoid header parsing failure
Based on description by James Almer and the xiph wiki
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
Diego Biurrun [Fri, 5 Jul 2013 15:42:37 +0000 (17:42 +0200)]
tools: Wording and formatting cosmetics
Diego Biurrun [Tue, 2 Jul 2013 15:16:18 +0000 (17:16 +0200)]
tests: Only run noproxy test if networking is enabled
Luca Barbato [Sat, 6 Jul 2013 10:05:27 +0000 (12:05 +0200)]
fifo: K&R formatting cosmetics
Luca Barbato [Mon, 1 Jul 2013 01:05:41 +0000 (03:05 +0200)]
kmvc: Clip pixel position to valid range
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Mon, 1 Jul 2013 01:04:15 +0000 (03:04 +0200)]
kmvc: use fixed sized arrays in the context
Avoid some boilerplate code to dynamically allocate and then free the
buffers.
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.