]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 21 Jan 2013 12:38:57 +0000 (13:38 +0100)]
Merge commit '
68f18f03519ae550e25cf12661172641e9f0eaca '
* commit '
68f18f03519ae550e25cf12661172641e9f0eaca ':
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
dsputil: drop non-compliant "fast" qpel mc functions
get_bits: change the failure condition in init_get_bits
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 9 Jan 2013 10:56:18 +0000 (10:56 +0000)]
EVRC decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 20 Jan 2013 16:50:17 +0000 (17:50 +0100)]
oggdec: #if 0 disabled code
Fixes CID968589
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Micah Galizia [Mon, 21 Jan 2013 01:25:30 +0000 (20:25 -0500)]
fix memory leak on string reassign
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes CID968584 and CID968585
Michael Niedermayer [Sun, 20 Jan 2013 23:52:14 +0000 (00:52 +0100)]
swr: support first_pts
Trolled-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Xi Wang [Sun, 20 Jan 2013 20:38:21 +0000 (15:38 -0500)]
lavfi: fix null checking in avfilter_config_links()
Move the first use of `link' after the null pointer check.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 20 Jan 2013 22:26:35 +0000 (23:26 +0100)]
Clarify that the recommended audio squeezing/stretching filter is aresample.
Fixes ticket #2036.
Xi Wang [Sun, 20 Jan 2013 20:26:12 +0000 (15:26 -0500)]
cafdec: fix overflow checking in read_header()
Several compilers such as clang/icc/pathscale will optimize the check
pos + size < pos (assuming size > 0) into false, since signed integer
overflow is undefined behavior in C. This breaks overflow checking.
Use a safe precondition check instead.
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 19:59:30 +0000 (20:59 +0100)]
wtvdec: fix integer overflow
Fixes CID968583
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 19:02:35 +0000 (20:02 +0100)]
h264/ff_generate_sliding_window_mmcos: fix use of uninitialized variable
Fixes CID968587
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 19:01:39 +0000 (20:01 +0100)]
h264: print mismatching opcode details in check_opcodes()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 18:50:33 +0000 (19:50 +0100)]
h264: fix use of uninitialized variable
Fixed CID968588
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 19:02:37 +0000 (20:02 +0100)]
theora: support midstream reconfiguration
Fixes Ticket868
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Jan 2013 18:58:59 +0000 (19:58 +0100)]
oggdec: Support chained streams, support replacing streams in multistream files.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Conflicts:
Changelog
Michael Niedermayer [Sun, 20 Jan 2013 16:14:25 +0000 (17:14 +0100)]
vc1dec: add assert to impossible *_valid combination.
This also fixes a warning about uninitialized variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 16:09:48 +0000 (17:09 +0100)]
swr: fix "may be used uninitialized in this function" warnings
The uninitialized use implicates 0 channels, which is unlikely
to reach this function but fixed anyway in this commit.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sun, 20 Jan 2013 13:48:35 +0000 (14:48 +0100)]
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
libavutil/arm/asm.S sets '.arch' depending on HAVE_ARMV5TE so that
assembling armv5te code will always succeed even if the default -march
flag does not support it. HAVE_ARMV5TE_EXTERNAL tests assembling code
with the default arch.
Fixes the missing symbol ff_prefetch_arm with --cpu= not including
armv5te.
CC: libav-stable@libav.org
Michael Niedermayer [Sun, 20 Jan 2013 14:03:13 +0000 (15:03 +0100)]
h264: Only apply error concealment if theres a frame
Without any correctly decoded slices, there can be no frame.
Fixes out of array reads
Found-by: Rafaël Carré
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Fri, 18 Jan 2013 22:37:41 +0000 (23:37 +0100)]
dsputil: drop non-compliant "fast" qpel mc functions
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sun, 20 Jan 2013 13:20:06 +0000 (14:20 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 13:07:51 +0000 (14:07 +0100)]
Merge commit '
fef906c77c09940a2fdad155b2adc05080e17eda '
* commit '
fef906c77c09940a2fdad155b2adc05080e17eda ':
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 12:57:10 +0000 (13:57 +0100)]
Merge commit '
aeaf268e52fc11c1f64914a319e0edddf1346d6a '
* commit '
aeaf268e52fc11c1f64914a319e0edddf1346d6a ':
vp3: integrate clear_blocks with idct of previous block.
mpegvideo: fix loop condition in draw_line()
dvdsubdec: parse the size from the extradata
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 20 Jan 2013 04:10:32 +0000 (05:10 +0100)]
get_bits: change the failure condition in init_get_bits
Too much code relies in having init_get_bits fed with a valid
buffer and set its dimension to 0.
Check for NULL buffer instead.
Ronald S. Bultje [Fri, 18 Jan 2013 06:02:58 +0000 (22:02 -0800)]
Remove put_no_rnd_pixels_l2 function pointer for w=16 from dsputil.
The function is never used.
Ronald S. Bultje [Sun, 20 Jan 2013 06:21:10 +0000 (22:21 -0800)]
Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
Conveniently (together with Justin's earlier patches), this makes
our vorbis decoder entirely independent of dsputil.
Ronald S. Bultje [Fri, 18 Jan 2013 15:43:04 +0000 (16:43 +0100)]
vp3: integrate clear_blocks with idct of previous block.
This is identical to what e.g. vp8 does, and prevents the function call
overhead (plus dependency on dsputil for this particular function).
Arm asm updated by Janne Grunau <janne-libav@jannau.net>.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Matthieu Bouron [Sat, 19 Jan 2013 12:32:58 +0000 (13:32 +0100)]
lavf/id3v2: seek back to previous offset if header size is not matched
Makes ff_id3v2_read reset stream position at the end of ID3 data if the
header size is not matched (caused by an EOF for example).
Current behaviour (without the patch):
filesize = 400
id3 data size = 399
file offset after ff_id3v2_read is 400 instead of 399
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 20 Jan 2013 03:14:09 +0000 (04:14 +0100)]
mpeg1enc: Disable threads for resolutions too large for multi-threading
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 21:46:34 +0000 (22:46 +0100)]
sws: check that dither array is not null before memset
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 20:43:54 +0000 (21:43 +0100)]
sws: Check for unsupported combination of ED/FULL_CHR flags
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 22:11:26 +0000 (23:11 +0100)]
sws: Fix error diffusion flag
The used flag was mistakenly overlapping with chroma drop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Xi Wang [Sat, 19 Jan 2013 18:21:35 +0000 (13:21 -0500)]
mpegvideo: fix loop condition in draw_line()
The loop condition `x = ex' is incorrect. It should be `x <= ex'.
This bug was introduced in commit
c65dfac4 "mpegvideo.c: K&R formatting
and cosmetics."
CC:libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Nicolas George [Wed, 2 Jan 2013 18:08:08 +0000 (19:08 +0100)]
ffmpeg: accept "chapters" as forced key frames.
Allow to force a key frame at the beginning of each chapter.
Clément Bœsch [Wed, 16 Jan 2013 17:42:16 +0000 (18:42 +0100)]
dvdsubdec: parse the size from the extradata
Signed-off-by: Alexandra Khirnova <alexandra.khirnova@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Thu, 17 Jan 2013 16:03:07 +0000 (17:03 +0100)]
cmdline: fix -- to escape files starting with -
Fixes Ticket2127
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matthieu Bouron [Sat, 19 Jan 2013 12:38:26 +0000 (13:38 +0100)]
lavf/id3v2: cosmetics: reindent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 19 Jan 2013 04:02:19 +0000 (01:02 -0300)]
configure: Fix Barcelona and Bulldozer compiler options with suncc
Barcelona/amdfam10 does not support SSE4 instructions.
Also, Bulldozer supports AVX instructions, so use them instead.
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 19 Jan 2013 03:48:59 +0000 (00:48 -0300)]
doc/Makefile: Fix make docclean
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 12:18:10 +0000 (13:18 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: dsputil: Drop some unused macro definitions
x86: Add a Yasm-based emms() replacement
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 12:11:34 +0000 (13:11 +0100)]
Merge commit '
d633d12b2cc999cee3ac25bf9a810fe7ff03726d '
* commit '
d633d12b2cc999cee3ac25bf9a810fe7ff03726d ':
x86inc: Add cvisible macro for C functions with public prefix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 12:01:06 +0000 (13:01 +0100)]
Merge commit '
ef5d41a5534b65f03d02f2e11a503ab8416bfc3b '
* commit '
ef5d41a5534b65f03d02f2e11a503ab8416bfc3b ':
x86inc: Rename "program_name" to "private_prefix"
configure: Run SHFLAGS through ldflags_filter()
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:45:34 +0000 (10:45 +0100)]
APIchanges: Add git version and fix version for avfilter_ref_get_channels().
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:42:27 +0000 (10:42 +0100)]
Add APIchanges entry for av_codec_get_tag2().
Michael Niedermayer [Sat, 19 Jan 2013 05:18:24 +0000 (06:18 +0100)]
h264: unmark frames at the end
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 03:21:44 +0000 (04:21 +0100)]
sws: fix ED mono dither black level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 02:56:00 +0000 (03:56 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: flush video filters on seek
ffplay: use videoq.serial to detect obsolete frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
sedacca@comcast.net [Fri, 18 Jan 2013 05:13:10 +0000 (05:13 +0000)]
lavfi: EBU R.128 irregular time
Correct the time interval between logged data rows to the expected
value of 100 milliseconds by naming a new loop counter variable
to be distinct from loop counters for inner loops that
inadvertently change the outer loop operation.
This suggested patch is 1 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one patch.
Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 00:48:47 +0000 (01:48 +0100)]
sws: Enable full chroma resolution when needed for ED dither
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 00:40:10 +0000 (01:40 +0100)]
sws: Only reset dither state for bitexact mode
the output looks better with a random initial state than
all 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 00:39:42 +0000 (01:39 +0100)]
sws: rgb/bgr 4/8 error diffusion dither
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 19 Jan 2013 00:38:54 +0000 (01:38 +0100)]
sws: add AVOption flag for error diffusion dither
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 18 Jan 2013 23:44:31 +0000 (00:44 +0100)]
doc/muxers: apply minor cosmetics to segment option descriptions
Marton Balint [Thu, 27 Dec 2012 00:59:12 +0000 (01:59 +0100)]
ffplay: flush video filters on seek
Actually we just re-create the filters, since there is no way to flush them.
Fixes hangup with yadif filter on seeking forward caused by a filtered frame
with a pts before the seek.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Wed, 2 Jan 2013 00:00:12 +0000 (01:00 +0100)]
ffplay: use videoq.serial to detect obsolete frames
Previously VideoPicture->skip was used for that, using videoq.serial enables us
to detect obsolete frames right after pushing flush_pkt to the packet queue, so
we don't have to wait for the decoder thread to pop the flush packet anymore.
This is good because until now a full video picture queue may have blocked the
decoder thread.
Signed-off-by: Marton Balint <cus@passwd.hu>
Stefano Sabatini [Wed, 16 Jan 2013 19:10:12 +0000 (20:10 +0100)]
lavf/segment: do not auto-select a video stream with attached_pic disposition
In particular, fix trac ticket #2138.
Stefano Sabatini [Wed, 16 Jan 2013 18:52:58 +0000 (19:52 +0100)]
lavf/segment: move reference stream selection code to a dedicated function
Stefano Sabatini [Fri, 21 Dec 2012 01:39:53 +0000 (02:39 +0100)]
lavf/segment: remove now unused field list_max_segment_time
Stefano Sabatini [Thu, 20 Dec 2012 13:20:19 +0000 (14:20 +0100)]
lavf/segment: add support to segment list file entries sliding window listing
In particular, should fix trac ticket #1842.
Stefano Sabatini [Mon, 10 Dec 2012 23:14:22 +0000 (00:14 +0100)]
lavf/segment: add SegmentListEntry and use it
This patch is propedeutic to the incoming patch which adds
support to sliding window segment listing.
Stefano Sabatini [Wed, 16 Jan 2013 11:53:01 +0000 (12:53 +0100)]
lavf/utils: provide feedback in case of invalid probe size
Log message in case the max_probe_size value in av_probe_input_buffer()
is smaller than the minimum accepted value.
Paul B Mahol [Fri, 18 Jan 2013 15:08:50 +0000 (15:08 +0000)]
vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha
Remove alpha_pix_fmts[].
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 18 Jan 2013 22:01:08 +0000 (23:01 +0100)]
sws: Support error diffusion dither for mono output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Fri, 18 Jan 2013 18:00:35 +0000 (19:00 +0100)]
doc/filters: create a dedicated "Examples" subsection for fade, and use @itemize
Stefano Sabatini [Fri, 18 Jan 2013 17:56:29 +0000 (18:56 +0100)]
lavfi/fade: accept shorthand syntax
Diego Biurrun [Wed, 16 Jan 2013 22:50:57 +0000 (23:50 +0100)]
x86: dsputil: Drop some unused macro definitions
Martin Storsjö [Wed, 9 Jan 2013 20:57:41 +0000 (22:57 +0200)]
x86: Add a Yasm-based emms() replacement
This provides a fallback when building with Yasm enabled, but neither
inline assembly, nor the _mm_empty intrinsic are available or enabled.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 9 Jan 2013 22:17:08 +0000 (23:17 +0100)]
x86inc: Add cvisible macro for C functions with public prefix
This allows defining externally visible library symbols.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Wed, 9 Jan 2013 22:15:14 +0000 (23:15 +0100)]
x86inc: Rename "program_name" to "private_prefix"
The new name is more descriptive and will allow defining a separate
public prefix for externally visible library symbols.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Sean McGovern [Mon, 14 Jan 2013 17:52:00 +0000 (12:52 -0500)]
configure: Run SHFLAGS through ldflags_filter()
These flags are as linker-specific as other LDFLAGS and thus
need to be translated to the correct linker syntax.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Stefano Sabatini [Fri, 18 Jan 2013 17:36:35 +0000 (18:36 +0100)]
doc/filters: avoid @example for showing the drawbox shorthand syntax
Improve overall consistency.
Michael Niedermayer [Sat, 12 Jan 2013 21:14:25 +0000 (22:14 +0100)]
golomb: check log validity before shifting
Fixes invalid right shift in fate-cavs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 18 Jan 2013 10:41:09 +0000 (10:41 +0000)]
vf_fade: support YUVA422P & YUVA444P
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 16 Jan 2013 00:26:44 +0000 (01:26 +0100)]
h264/get_lowest_part_list_y: remove unneeded operations
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 Jan 2013 12:54:38 +0000 (13:54 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: avoid pointless copying of ref lists
lavr: always reset mix function names and pointers in mix_function_init()
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
fate: update ref after rv30_loop_filter fix
rv30: fix masking in rv30_loop_filter()
Conflicts:
tests/ref/fate/filter-delogo
tests/ref/fate/rv30
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 18 Jan 2013 12:36:39 +0000 (13:36 +0100)]
Merge commit '
80ac87c13dc8c6c063e26a464c5c542357c0583f '
* commit '
80ac87c13dc8c6c063e26a464c5c542357c0583f ':
lavc: support ZenoXVID custom tag
libcdio: support recent cdio-paranoia
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
theora: Skip zero-sized headers
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jonas Bechtel [Sun, 13 Jan 2013 20:45:15 +0000 (21:45 +0100)]
Fix opencv detection.
This commit changes the ".so" argument placement in check_ld sub-program.
Anton Khirnov [Thu, 17 Jan 2013 11:25:31 +0000 (12:25 +0100)]
h264: avoid pointless copying of ref lists
ref_list is constructed from other fields per slice when needed, so do
not copy it for both frame and slice threading.
default_ref_list is constructed per frame and still needs to be copied
to per-slice contexts for slice threading, but a copy is not needed for
frame threading.
Michael Niedermayer [Fri, 18 Jan 2013 00:28:44 +0000 (01:28 +0100)]
avcodec_decode_audio: do not trust the channel layout, use the channel count.
Fixes memory corruption
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 16 Jan 2013 19:18:38 +0000 (14:18 -0500)]
lavr: always reset mix function names and pointers in mix_function_init()
CC: libav-stable@libav.org
Justin Ruggles [Wed, 16 Jan 2013 19:15:57 +0000 (14:15 -0500)]
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.
CC:libav-stable@libav.org
Michael Niedermayer [Thu, 17 Jan 2013 23:22:39 +0000 (00:22 +0100)]
mlpdec: dont leave a invalid huff_lsb in the context.
Fix assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Jan 2013 21:45:12 +0000 (22:45 +0100)]
mpegvideo: reset context state on failed thread update.
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 17 Jan 2013 22:06:46 +0000 (23:06 +0100)]
fate: update ref after rv30_loop_filter fix
Xi Wang [Thu, 17 Jan 2013 06:24:15 +0000 (01:24 -0500)]
rv30: fix masking in rv30_loop_filter()
The mask `x && (1 << y)' is incorrect and always yields true.
The correct form should be `x & (1 << y)'.
CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Thu, 17 Jan 2013 13:12:44 +0000 (14:12 +0100)]
lavc: support ZenoXVID custom tag
Looks like this kind of samples are produced by certain Russian
equipment.
Luca Barbato [Thu, 17 Jan 2013 10:24:01 +0000 (11:24 +0100)]
libcdio: support recent cdio-paranoia
Upstream decided to split the paranoia interface and move the headers
accordingly.
Carl Eugen Hoyos [Thu, 17 Jan 2013 19:46:21 +0000 (20:46 +0100)]
Use new function av_codec_get_tag2() in ffmpeg.c.
Fixes ticket #1953.
Carl Eugen Hoyos [Thu, 17 Jan 2013 19:44:33 +0000 (20:44 +0100)]
Add a new function av_codec_get_tag2().
av_codec_get_tag() may return 0 both in case a codec_tag was
found and if no codec_tag was found.
The new function does not have this ambiguity.
Paul B Mahol [Wed, 16 Jan 2013 20:08:20 +0000 (20:08 +0000)]
.gitignore: add /doc/examples/pc-uninstalled
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Martin Storsjö [Thu, 17 Jan 2013 16:58:25 +0000 (18:58 +0200)]
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
This fixes builds on 64bit MSVC.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 17 Jan 2013 14:03:36 +0000 (16:03 +0200)]
theora: Skip zero-sized headers
This fixes a regression since
d9cf5f51 with theora over RTP
(possibly with other variants of theora as well).
In theora over RTP, the second of the 3 headers turns out to be
0 bytes long, which prior to
d9cf5f51 worked just fine. After
d9cf5f51 , reading from the bitstream reader fails (since the reader
wasn't initialized but returned an error if initialized with 0 bits).
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Thu, 17 Jan 2013 16:19:08 +0000 (17:19 +0100)]
Only skip MLP header in mpeg files if the codec actually is MLP.
Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file.
Reported-by: Mashiat Sarker Shakkhar
Carl Eugen Hoyos [Thu, 17 Jan 2013 15:12:59 +0000 (16:12 +0100)]
Make the latm decoder less verbose on initialisation.
Reviewed-by: Paul B Mahol
Michael Niedermayer [Tue, 15 Jan 2013 23:03:36 +0000 (00:03 +0100)]
mux/chunked interleaver: better align duration chunks.
This code causes the chunking to tend toward more optimal
alignment between streams.
The first chunks can still be less optimal aligned
Michael Niedermayer [Thu, 17 Jan 2013 14:08:50 +0000 (15:08 +0100)]
mux: de-obfuscate chunked interleaver checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Jan 2013 22:56:37 +0000 (23:56 +0100)]
mux: simplify chunking interleaver code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Jan 2013 12:44:37 +0000 (13:44 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
idcin: fix memleaks in idcin_read_packet()
Conflicts:
libavformat/idcin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 16 Jan 2013 21:27:14 +0000 (18:27 -0300)]
latmenc: Check for LOAS sync word
Write the packet unaltered if found.
Fixes ticket #1917
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 17 Jan 2013 01:11:12 +0000 (02:11 +0100)]
Fix detection of struct v4l2_frmsize_discrete.
It was always detected successfully.
Michael Niedermayer [Wed, 16 Jan 2013 23:15:33 +0000 (00:15 +0100)]
h264: add assert to check that block_offset is consistent.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>