Matthieu Castet [Sun, 15 Mar 2009 21:32:36 +0000 (21:32 +0000)]
Disallow out-of-tree builds with config.h in the source tree.
A config.h present in the source tree takes precedence over a config.h
in the build tree, which can possibly result in an incorrect build.
patch by matthieu castet, castet.matthieu free fr
Originally committed as revision 17994 to svn://svn.ffmpeg.org/ffmpeg/trunk
Ronald S. Bultje [Sun, 15 Mar 2009 20:14:25 +0000 (20:14 +0000)]
Fix index generation in the way that it was supposed to be used. See the
discussion in the ML thread "[PATCH] rmdec.c: merge old/new packet reading
code".
Over time, this code broke somewhat, e.g. seq was never actually written
into (and was thus always 1, therefore the seq condition was always true),
whereas it was supposed to be set to the sequence number of the video slice
in case the video frame is divided over multiple RM packets (slices). The
problem of this is that packets other than those containing the beginning
of a video frame would be indexed as well.
Secondly, flags&2 is supposed to be true for video keyframes and for these
audio packets containing the start of a block. For some codecs (e.g. AAC),
that is every single packet, whereas for others (e.g. cook), that is the
packet containing the first of a series of scrambled packets that are to be
descrambled together. Indexing any of the following would lead to incomplete
and thus useless frames. Problem here is that flags would be reset to 2 to
indicate that the first packet is ready to be returned, and in addition if
no data was left to be returned (which is always true for the first packet),
then we wouldn't actually write the index entry anyway.
All in all, the idea was good and it probably worked at some point, but that
is long ago. This patch should at the very least make it likely for this code
to be executed again at the right times, i.e. the way it was originally
intended to be used.
Originally committed as revision 17993 to svn://svn.ffmpeg.org/ffmpeg/trunk
Stefano Sabatini [Sun, 15 Mar 2009 10:33:51 +0000 (10:33 +0000)]
Rename the (yet not defined) macros:
PIX_FMT_RGB565_BE -> PIX_FMT_RGB565BE
PIX_FMT_RGB565_LE -> PIX_FMT_RGB565LE
for consistency with the other pixfmts macros.
Originally committed as revision 17977 to svn://svn.ffmpeg.org/ffmpeg/trunk
Reimar Döffinger [Sat, 14 Mar 2009 20:50:54 +0000 (20:50 +0000)]
Make pcm_read_seek treat negative time stamps as 0, this avoids incorrectly
seeking before data_offset and is more consistent with how the generic index
seeking code handles it.
Originally committed as revision 17964 to svn://svn.ffmpeg.org/ffmpeg/trunk
Reimar Döffinger [Thu, 12 Mar 2009 11:47:50 +0000 (11:47 +0000)]
Set video width/height and create audio stream in read_packet instead of
pre-parsing the file in read_header.
This avoids some code duplication and seeking, and also avoids an IO error
for small video-only files (as created during e.g. the FATE encoder test).
Originally committed as revision 17945 to svn://svn.ffmpeg.org/ffmpeg/trunk
Cédric Schieli [Wed, 11 Mar 2009 14:22:53 +0000 (14:22 +0000)]
In initMMX2HScaler, when chrDstW is not divisible by 4, the last filterPos element is initialized on the wrong index (not evenly aligned). This fixes it
Originally committed as revision 28933 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Ronald S. Bultje [Tue, 10 Mar 2009 12:55:29 +0000 (12:55 +0000)]
Correctly skip complete INDX chunks, i.e. read the 32-bit header correctly
and if the size is broken (20 bytes, header-only), calculate the expected
size and skip the index entries anyway. See "[PATCH] rmdec.c: correctly
skip indexes" thread.
Originally committed as revision 17924 to svn://svn.ffmpeg.org/ffmpeg/trunk
Prevent (negative) overflow of rm->remaining_len. This evaluation really only
has two possible outcomes: either len and rm->remaining_len are the same, in
which case we care about the outcome and it is zero, or rm->remaining_len is
currently not in use and we don't care about the outcome. In that case, len
is positive and rm->remaining_len is zero, which leads to a negative result.
This is confusing and could eventually lead to a sign-flip if we skip a lot
of packets (unlikely, but still). Therefore, just always set it to zero.
Originally committed as revision 17919 to svn://svn.ffmpeg.org/ffmpeg/trunk
Functional part Kenan Gillet's 'extract and share weighted_vector_sumf'
patchset. Idea is to share this common code between the AMR and QCELP
decoders.
Originally committed as revision 17916 to svn://svn.ffmpeg.org/ffmpeg/trunk
Kostya Shishkov [Mon, 9 Mar 2009 17:25:43 +0000 (17:25 +0000)]
Mask all unused bits for packed pixel format instead of green and alpha mask only.
That fixes the case when converting 15-bit RGB/BGR to YUV and high bit is set
for input value(s).
Originally committed as revision 28916 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Prevent (negative) overflow of rm->remaining_len. This evaluation really only
has two possible outcomes: either len and rm->remaining_len are the same, in
which case we care about the outcome and it is zero, or rm->remaining_len is
currently not in use and we don't care about the outcome. In that case, len
is positive and rm->remaining_len is zero, which leads to a negative result.
This is confusing and could eventually lead to a sign-flip if we skip a lot
of packets (unlikely, but still). Therefore, just always set it to zero.
Originally committed as revision 17910 to svn://svn.ffmpeg.org/ffmpeg/trunk
Replace separate packet parsing for "old_format" .ra files by a call to
ff_rm_parse_packet(). See "[PATCH] Make RM demuxer behave better with -an
option" thread, which sort-of turned into an aggregate of unrelated rmdec.c
cleanups.
Originally committed as revision 17909 to svn://svn.ffmpeg.org/ffmpeg/trunk
Move frame discarding out of the ff_rm_parse_packet() loop, and respect
rm->audio_pkt_cnt in case multiple packets should be read before the next
syncpoint in the file, so that ffplay -an on a file containing AAC audio
works. See "[PATCH] Make RM demuxer behave better with -an option" thread
on mailinglist.
Originally committed as revision 17908 to svn://svn.ffmpeg.org/ffmpeg/trunk