]>
git.sesse.net Git - ffmpeg/log
Nicolas George [Tue, 3 Jul 2012 18:34:27 +0000 (20:34 +0200)]
ffmpeg: rework checks for the -t option.
This commit is based on libav's implementation and
makes sure to compare output timestamps together.
It also reduces the differences with avconv.
The changes to the test reference files are caused
by an additional packet at the end, the timestamp
of the frame encoded by this packet is always
strictly below the limit stated by the -t option.
Nicolas George [Wed, 4 Jul 2012 10:50:55 +0000 (12:50 +0200)]
error: define AVERROR_EXTERNAL.
This code is intended for errors in external libraries
when no corresponding error code can be found.
AVERROR_UNKNOWN is too vague for that and looks like AVERROR_BUG.
Nicolas George [Wed, 4 Jul 2012 10:42:48 +0000 (12:42 +0200)]
error: define AVERROR_BUFFER_TOO_SMALL.
Some API require a buffer and return a specific error
if it is too small. This error code helps to map codes.
Carl Eugen Hoyos [Wed, 4 Jul 2012 06:46:28 +0000 (08:46 +0200)]
Let the ffmpeg executable select the abuffersink filter.
Michael Niedermayer [Wed, 4 Jul 2012 01:48:36 +0000 (03:48 +0200)]
ffmpeg: Add sanity check on frame duplication
This prevents long loops and OOM in case of damaged timestamps in some
cases
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Piotr Bandurski [Wed, 4 Jul 2012 00:05:22 +0000 (02:05 +0200)]
riff: add "YUV8" FourCC
sample:
http://samples.mplayerhq.hu/V-codecs/yuv8/MAILTEST.AVI
Reviewed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 14 Jan 2012 10:25:45 +0000 (11:25 +0100)]
doc/muxers/segment: apply minor documentation updates and adjustements
Update documentation to match code behavior after previous changes, also
reword the examples section.
Michael Niedermayer [Tue, 3 Jul 2012 22:55:00 +0000 (00:55 +0200)]
snow: move init code that depends on picture paramaters to after these parameters are known.
This should fix debug 2048 amongth other things
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 22:47:18 +0000 (00:47 +0200)]
video_get_buffer: return ENOMEM instead of -1 on malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 22:46:36 +0000 (00:46 +0200)]
lavc/utils: print error message on get_buffer related errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 22:45:37 +0000 (00:45 +0200)]
mdutils: print error message on error get_buffer related errors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 22:32:31 +0000 (00:32 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cosmetics: Consistently use C-style comments with multiple inclusion guards
anm: fix a few Doxygen comments
misc typo and wording fixes
attributes: add av_noreturn
attributes: drop pointless define guards
configure: do not disable av_always_inline with --enable-small
flvdec: initial stream switch support
avplay: fix write on freed memory for rawvideo
snow: remove a VLA used for edge emulation
x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
snow: remove the runs[] VLA.
snow: Check mallocs at init
flacdec: remove redundant setting of avctx->sample_fmt
Conflicts:
ffplay.c
libavcodec/h264.c
libavcodec/snow.c
libavcodec/snow.h
libavcodec/snowdec.c
libavcodec/snowenc.c
libavformat/flvdec.c
libavutil/attributes.h
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Tue, 17 Jan 2012 19:04:14 +0000 (20:04 +0100)]
lavf/segment: rename SegmentContext.pb to list_pb
The new name is more auto-explicative, as the pb is used for the segment
list file.
Stefano Sabatini [Tue, 17 Jan 2012 18:50:12 +0000 (19:50 +0100)]
lavf/segment: add error log in case of invalid filename template
Better rather than silently exit.
Stefano Sabatini [Sat, 14 Jan 2012 01:40:09 +0000 (02:40 +0100)]
lavf/segment: fix logic for segmenting audio-only inputs
Also add a comment for clarifying the logic.
Fix trac ticket #1290.
Stefano Sabatini [Mon, 16 Jan 2012 23:15:48 +0000 (00:15 +0100)]
lavf/segment: add more information in log message in seg_write_packet()
Nedeljko Babic [Tue, 26 Jun 2012 11:13:21 +0000 (13:13 +0200)]
doc: add documentation regarding MIPS optimizations
Add doc/mips.txt document with short explanation regarding targeted
platform for MIPS optimizations and regarding MIPS copyright notice.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Mon, 16 Jan 2012 16:58:50 +0000 (17:58 +0100)]
lavf/segment: remove unused offset variable
Stefano Sabatini [Sat, 14 Jan 2012 10:00:16 +0000 (11:00 +0100)]
lavf/segment: apply misc fixes to the private options internal documentation
Option help message tell what the option *does*, not what the set field
represents.
Stefano Sabatini [Fri, 13 Jan 2012 23:19:59 +0000 (00:19 +0100)]
lavf/segment: slightly simplify fail logic in seg_write_packet()
Stefano Sabatini [Fri, 13 Jan 2012 23:16:55 +0000 (00:16 +0100)]
lavf/segment: move list filename printing logic from segment_end() to segment_start()
Allow to deal with the list file printing only in a single point, thus
simplifying logic, and allow a bit of factorization (no special case
needed when printing the first file name of the list).
Carl Eugen Hoyos [Tue, 3 Jul 2012 19:35:20 +0000 (21:35 +0200)]
Suggest aresample filter if it was not compiled but requested.
Michael Niedermayer [Tue, 3 Jul 2012 02:10:52 +0000 (04:10 +0200)]
avcodec_align_dimensions2: support 12 & 14 bit planar colorspaces
Reviewed-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 17:00:01 +0000 (19:00 +0200)]
imgconvert: add planar RGB formats to pix_fmt_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 16:57:02 +0000 (18:57 +0200)]
imgconvert: add yuv 9,10,12,14 bit planar YUV formats to pix_fmt_info
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 02:09:28 +0000 (04:09 +0200)]
libavutil: add 12 and 14 bit planar colorspaces
Reviewed-by: Jean First <jeanfirst@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 2 Jul 2012 08:17:07 +0000 (10:17 +0200)]
cosmetics: Consistently use C-style comments with multiple inclusion guards
Diego Biurrun [Mon, 2 Jul 2012 18:40:26 +0000 (20:40 +0200)]
anm: fix a few Doxygen comments
Diego Biurrun [Wed, 13 Jun 2012 09:41:12 +0000 (11:41 +0200)]
misc typo and wording fixes
Reinhard Tartler [Sun, 1 Jul 2012 17:38:40 +0000 (19:38 +0200)]
attributes: add av_noreturn
Also use it in the declaration of the various exit_program
implementations in avtools.
inspired by a clang-scan report.
Reinhard Tartler [Sun, 1 Jul 2012 18:36:03 +0000 (20:36 +0200)]
attributes: drop pointless define guards
the av_-prefixed attributes must not be defined outside of this file
Mans Rullgard [Sun, 1 Jul 2012 19:21:10 +0000 (20:21 +0100)]
configure: do not disable av_always_inline with --enable-small
Currently, --enable-small turns av_always_inline into plain inline,
which is more or less ignored by the compiler. While the intent of
this is probably to reduce code size by avoiding some inlining, it
has more far-reaching effects.
We use av_always_inline in two situations:
1. The body of a function is smaller than the call overhead.
Instances of these are abundant in libavutil, the bswap.h
functions being good examples.
2. The function is a template relying on constant propagation
through inlined calls for sane code generation. These are
often found in motion compensation code.
Both of these types of functions should be inlined even if targeting
small code size.
Although GCC has heuristics for detecting the first of these types,
it is not always reliable, especially when the function uses inline
assembler, which is often the reason for having those functions in
the first place, so making it explicit is generally a good idea.
The size increase from inlining template-type functions is usually
much smaller than it seems due to different branches being mutually
exclusive between the different invocations. The dead branches can,
however, only be removed after inlining and constant propagation have
been performed, which means the initial cost estimate for inlining
these is much higher than is actually the case, resulting in GCC
often making bad choices if left to its own devices.
Furthermore, the GCC inliner limits how much it allows a function to
grow due to automatic inlining of calls, and this appears to not take
call overhead into account. When nested inlining is used, the limit
may be hit before the innermost level is reached. In some cases, this
has prevented inlining of type 1 functions as defined above, resulting
in significant performance loss.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Luca Barbato [Sun, 1 Jul 2012 21:01:00 +0000 (23:01 +0200)]
flvdec: initial stream switch support
Codec change midstream gets mapped to a separate stream.
Luca Barbato [Thu, 28 Jun 2012 18:55:04 +0000 (20:55 +0200)]
avplay: fix write on freed memory for rawvideo
Do not assume avpacket and the decoded frames are independent.
To be absolutely sure and not sprinkle av_free_packet around the code
the call had been placed before getting the frame and on the error path.
Ronald S. Bultje [Mon, 2 Jul 2012 07:39:54 +0000 (10:39 +0300)]
snow: remove a VLA used for edge emulation
Signed-off-by: Martin Storsjö <martin@martin.st>
Mans Rullgard [Mon, 2 Jul 2012 22:04:04 +0000 (23:04 +0100)]
x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
These functions are defined conditionally so any uses need to have
preprocessor guards.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Paul B Mahol [Tue, 3 Jul 2012 11:56:55 +0000 (11:56 +0000)]
jvdec: check if there is enough data
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 3 Jul 2012 11:38:19 +0000 (11:38 +0000)]
jvdec: remove redundant check
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 3 Jul 2012 11:34:33 +0000 (11:34 +0000)]
jvdec: remove buf_size
It is same as avpkt->size.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 3 Jul 2012 11:16:56 +0000 (11:16 +0000)]
jvdec: stop reading partial palette
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 2 Jul 2012 14:04:30 +0000 (16:04 +0200)]
tools: add bisect script
This script works like "git bisect" except that you can
specify with "bisect need ffmpeg|ffplay|ffserver|ffprobe" which tool(s)
are needed for testing a checkout
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 10:43:06 +0000 (12:43 +0200)]
yadif/x86: add prototypes for functions, make code valid C again.
Broken by: libav (
a87b17f3283aada762820f1b797eeb7a2dff6c61 )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 10:32:26 +0000 (12:32 +0200)]
jvdec: check that the video_size fits in the packet.
Prevents use of out of array data and fate failure.
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 3 Jul 2012 09:51:44 +0000 (09:51 +0000)]
jvdec: fix memleak of jv->frames
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ronald S. Bultje [Sat, 30 Jun 2012 17:34:39 +0000 (10:34 -0700)]
snow: remove the runs[] VLA.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 2 Jul 2012 07:39:25 +0000 (10:39 +0300)]
snow: Check mallocs at init
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 3 Jul 2012 03:24:26 +0000 (05:24 +0200)]
jvdemux: correct size for truncated packets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 3 Jul 2012 00:52:06 +0000 (00:52 +0000)]
fate: add test for Bitmap Brothers JV demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 3 Jul 2012 00:44:55 +0000 (00:44 +0000)]
fate: add test for Bitmap Brothers JV video
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 3 Jul 2012 01:21:24 +0000 (03:21 +0200)]
h264pred: assert that depth is supported
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 01:20:51 +0000 (03:20 +0200)]
h264dsp: assert that depth is supported
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 3 Jul 2012 01:19:55 +0000 (03:19 +0200)]
dsputil: assert that depth is supported
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 25 Jun 2012 22:41:33 +0000 (00:41 +0200)]
lavfi: remove vsrc_buffer.h API
The vsrc_buffer.h is not installed since commit
0b3b95813576 , so there is
no point into keeping it around.
The buffersrc.h API, which is more powerful, should be used instead.
Stefano Sabatini [Mon, 25 Jun 2012 16:56:46 +0000 (18:56 +0200)]
lavc/rawdec: add assertion check in raw_decode()
Check on an implicit assumption done on the number of coded bits for
paletted rawvideo with coded bits == 2.
Stefano Sabatini [Mon, 25 Jun 2012 15:59:01 +0000 (17:59 +0200)]
lavc/rawdec: prefer constant AVPALETTE_SIZE over 256*4
Improve readability.
Michael Niedermayer [Mon, 2 Jul 2012 22:40:26 +0000 (00:40 +0200)]
h264: sps: handle more profiles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 22:36:08 +0000 (00:36 +0200)]
h264: add support for constraint_set4_flag / constraint_set5_flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 21:49:54 +0000 (23:49 +0200)]
x86/gradfun: fix compilation failure on open solaris
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 21:43:06 +0000 (23:43 +0200)]
Revert "alsdec: remove dead assignments"
This reverts commit
4ca6d206d1b5beea42c4290d2ee801aaf5cd31f0 .
The assignment is not dead, this should fix fate failures on BSD
Michael Niedermayer [Mon, 2 Jul 2012 21:23:33 +0000 (23:23 +0200)]
has_decode_delay_been_guessed: tighten up the heuristic.
This adds the minimum delay needed with the current decoder to
recognize the reorder buffer size for the reference bitstreams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 21:18:32 +0000 (23:18 +0200)]
has_decode_delay_been_guessed: skip guessing when sps.num_reorder_frames is available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 21:18:04 +0000 (23:18 +0200)]
fate: drop strict 1 for MR4_TANDBERG_C.264 and MR5_TANDBERG_C.264
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 21:16:59 +0000 (23:16 +0200)]
h264: add avpriv_h264_has_num_reorder_frames()
This function exports the exact sps.num_reorder_frames value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Mon, 2 Jul 2012 12:49:13 +0000 (13:49 +0100)]
flacdec: remove redundant setting of avctx->sample_fmt
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Mon, 2 Jul 2012 20:59:42 +0000 (22:59 +0200)]
has_decode_delay_been_guessed: improve heuristic
This allows MR4_TANDBERG_C.264 and MR5_TANDBERG_C.264 to be decoded without -strict 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 19:24:47 +0000 (21:24 +0200)]
doc/developer: refer to av_malloc() instead of malloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 19:19:41 +0000 (21:19 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
asfdec: read attached pictures.
apetag: reindent
apetag: export attached covers as video streams.
apetag: fix the amount of data read from binary tags.
apetag: make sure avio_get_str() doesn't read more than it should.
mov: read itunes cover art.
snow: remove VLA in mc_block()
intfloat: Don't use designated initializers in the public headers
snow: remove a VLA.
doc: Remind devs to check return values, especially for malloc() et al
MS ATC Screen (aka MSS3) decoder
vf_yadif: move x86 init code to x86/yadif.c
vf_gradfun: move x86 init code to x86/gradfun.c
roqvideo: Remove a totally unused dspcontext
smacker: remove some unused code
dsicin: remove dead assignment
aacdec: remove dead assignment
rl2: remove dead assignment
proresenc: make a variable local to the loop where it is used
alsdec: remove dead assignments
Conflicts:
Changelog
doc/developer.texi
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavfilter/gradfun.h
libavfilter/x86/gradfun.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 2 Jul 2012 17:31:35 +0000 (19:31 +0200)]
mem: heap memory poisoning.
Enable it by default with FATE.
limitation: not random, and not supported with realloc.
Michael Niedermayer [Mon, 2 Jul 2012 18:52:36 +0000 (20:52 +0200)]
vc1dsp: use av_assert2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 18:52:22 +0000 (20:52 +0200)]
resample2: use av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 15:33:27 +0000 (17:33 +0200)]
swr: fix warning: passing argument 2 of s->mix_any_f from incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 15:32:23 +0000 (17:32 +0200)]
swr: fix warning: passing argument 1 of s->mix_any_f from incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 15:31:16 +0000 (17:31 +0200)]
swr: fix warning: passing argument 2 of ctx->simd_f from incompatible pointer type
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Jul 2012 15:23:22 +0000 (17:23 +0200)]
swr: fix mix* related function pointer warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 21 Jun 2012 20:17:43 +0000 (22:17 +0200)]
asfdec: read attached pictures.
Anton Khirnov [Thu, 21 Jun 2012 17:02:40 +0000 (19:02 +0200)]
apetag: reindent
Anton Khirnov [Tue, 26 Jun 2012 16:58:39 +0000 (18:58 +0200)]
apetag: export attached covers as video streams.
Anton Khirnov [Tue, 26 Jun 2012 16:54:00 +0000 (18:54 +0200)]
apetag: fix the amount of data read from binary tags.
Substract the filename size from the data size.
Anton Khirnov [Tue, 26 Jun 2012 16:49:04 +0000 (18:49 +0200)]
apetag: make sure avio_get_str() doesn't read more than it should.
Anton Khirnov [Thu, 21 Jun 2012 16:24:27 +0000 (18:24 +0200)]
mov: read itunes cover art.
Clément Bœsch [Mon, 2 Jul 2012 06:17:40 +0000 (08:17 +0200)]
lavf/wtvdec: add missing { } around if.
This should fix the current failures spotted by FATE.
Mans Rullgard [Sun, 1 Jul 2012 14:39:22 +0000 (15:39 +0100)]
snow: remove VLA in mc_block()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Ronald S. Bultje [Mon, 2 Jul 2012 07:22:30 +0000 (10:22 +0300)]
intfloat: Don't use designated initializers in the public headers
intfloat.h is a public header, and is now (since
a1245d5ca ) included
by mathematics.h, which many external callers include.
This fixes building third party applications that include
mathematics.h in a language that doesn't support designated
initalizers.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 2 Jul 2012 10:47:08 +0000 (12:47 +0200)]
wmaenc: dont mess with the bitrate.
The bitrate is not writeable by an encoder.
Fixes generation of invalid wma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Fri, 15 Jun 2012 16:59:57 +0000 (09:59 -0700)]
snow: remove a VLA.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Sat, 30 Jun 2012 13:35:57 +0000 (15:35 +0200)]
doc: Remind devs to check return values, especially for malloc() et al
Kostya Shishkov [Thu, 28 Jun 2012 19:18:23 +0000 (21:18 +0200)]
MS ATC Screen (aka MSS3) decoder
Peter Ross [Mon, 2 Jul 2012 00:28:31 +0000 (10:28 +1000)]
wtvdec: return error when filetime_to_iso8601/crazytime_to_iso8601 conversion fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 1 Jul 2012 12:08:17 +0000 (13:08 +0100)]
vf_yadif: move x86 init code to x86/yadif.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 1 Jul 2012 11:51:30 +0000 (12:51 +0100)]
vf_gradfun: move x86 init code to x86/gradfun.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sun, 1 Jul 2012 23:58:30 +0000 (01:58 +0200)]
configure: make fast_unaligned configureable
Fixes Ticket1481
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 1 Jul 2012 20:46:28 +0000 (23:46 +0300)]
roqvideo: Remove a totally unused dspcontext
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 1 Jul 2012 20:12:38 +0000 (22:12 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt/eval: Include mathematics.h for NAN/INFINITY
mathematics: Don't use division by zero in NAN/INFINITY macros
wma: Lower the maximum number of channels to 2
x86: cpu: clean up check for cpuid instruction support
ARM: generate position independent code to access data symbols
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Jul 2012 19:41:06 +0000 (21:41 +0200)]
mov: add workaround for incorrect 0 time point.
Fixes Ticket1471
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sun, 1 Jul 2012 13:56:16 +0000 (14:56 +0100)]
smacker: remove some unused code
This removes some code apparently left over from vlc reader
debugging.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 1 Jul 2012 13:28:50 +0000 (14:28 +0100)]
dsicin: remove dead assignment
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 1 Jul 2012 12:50:09 +0000 (13:50 +0100)]
aacdec: remove dead assignment
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 1 Jul 2012 12:43:44 +0000 (13:43 +0100)]
rl2: remove dead assignment
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 1 Jul 2012 12:38:12 +0000 (13:38 +0100)]
proresenc: make a variable local to the loop where it is used
This moves the mbs_per_slice declaration inside the only loop
where it is used. Fixes a dead assignment.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sun, 1 Jul 2012 12:36:30 +0000 (13:36 +0100)]
alsdec: remove dead assignments
Signed-off-by: Mans Rullgard <mans@mansr.com>