Commit Graph

18939 Commits

Author SHA1 Message Date
Benoit Fouet
aa0bd99295 Revert the alphabetical reordering which made me owner of Baptiste's line.
Originally committed as revision 18012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 13:03:08 +00:00
Ronald S. Bultje
c882927957 Reindent after r18010.
Originally committed as revision 18011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 13:01:02 +00:00
Ronald S. Bultje
55d330f913 Mark the first output audio frame as keyframe (separate patch from previous,
as requested by Kostya). See "[PATCH] rmdec.c: remove cache access
duplication".

Originally committed as revision 18010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:59:18 +00:00
Ronald S. Bultje
c5efef7be9 Remove packet returning in ff_rm_parse_packet() if we're using the packet
cache, since this can already be accessed through ff_rm_retrieve_cache().
See "[PATCH] rmdec.c: remove cache access duplication" thread.

Originally committed as revision 18009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:57:49 +00:00
Benoit Fouet
748a4312b4 Fix alphabetical order.
Originally committed as revision 18008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:56:22 +00:00
Ronald S. Bultje
7268f0bd8e Reindent after r18005.
Originally committed as revision 18007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:50:12 +00:00
Daniel Verkamp
8127c4208c Fix an assert().
Patch by Daniel Verkamp daniel drv nu

Originally committed as revision 18006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:47:43 +00:00
Ronald S. Bultje
6a2d3fc30b Merge code for packet reading in "old" (.ra, audio-only) Realmedia files and
the newer (.rm, audio/video) files. See "[PATCH] rmdec.c: merge old/new
packet reading code" thread on mailinglist.

Originally committed as revision 18005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 12:47:34 +00:00
Cédric Schieli
2816ce4c91 Split YUV2RGB operands declaration into a separate macro
Originally committed as revision 28972 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-16 08:29:40 +00:00
Baptiste Coudurier
f05783c2db cosmetics, remove useless braces
Originally committed as revision 18004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:57 +00:00
Baptiste Coudurier
9bf1b2683c simplify printing
Originally committed as revision 18003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:28 +00:00
Baptiste Coudurier
f584386d54 reindent
Originally committed as revision 18002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:44:16 +00:00
Baptiste Coudurier
c6026e4360 fix trkn metadata parsing
Originally committed as revision 18001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:43:38 +00:00
Baptiste Coudurier
0fb44a4e47 move read_udta_string up to avoid forward declaration
Originally committed as revision 18000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:06:05 +00:00
Baptiste Coudurier
873358e5d4 more generic metadata handling
Originally committed as revision 17999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:03:29 +00:00
Baptiste Coudurier
2229a5c60e do not set isom if ctype is not set, happens in mov
Originally committed as revision 17998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 05:13:55 +00:00
David Conrad
170e6b14f7 Remove long unused ALTIVEC_USE_REFERENCE_C_CODE ifdef; all other references
to it were removed in r6606

Originally committed as revision 17997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 03:56:42 +00:00
Baptiste Coudurier
df8843c65f search for hdlr atom in meta, some files do not store version+flags
Originally committed as revision 17996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 23:54:53 +00:00
Ramiro Polla
06abe7f5b4 mingw32: call lib.exe instead of lib to facilitate running it through wine.
Originally committed as revision 17995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 23:15:57 +00:00
Matthieu Castet
337cee680b 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
2009-03-15 21:32:36 +00:00
Ronald S. Bultje
7a160bca83 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
2009-03-15 20:14:25 +00:00
Benjamin Larsson
b217024706 Add cook channel count function, part of multichannel cook
Originally committed as revision 17992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 19:36:45 +00:00
Benjamin Larsson
0eec287596 Add max allowed subpackets in multichannel cook
Originally committed as revision 17991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 19:34:52 +00:00
Diego Biurrun
3cf6adaf64 Remove code that was disabled by the recent major version bump.
Originally committed as revision 17990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 17:20:24 +00:00
Stefano Sabatini
323a8230fb Fix typo: 'conjuction' -> 'conjunction'.
Originally committed as revision 17989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 16:36:36 +00:00
Benjamin Larsson
d4b3d0408f save avctx in cook decoder context and use it for av_log
Originally committed as revision 17988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 14:11:11 +00:00
Benjamin Larsson
7c119ced99 memset when category is >=7, part of cook multichannel
Originally committed as revision 17987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 14:04:25 +00:00
Reimar Döffinger
16473c1376 1 km^3 cola, timecode_frame_start is a 64 bit integer, this resulted in
complete nonsense if timecode_frame_start was used on big-endian systems.

Originally committed as revision 17986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 13:38:36 +00:00
Carl Eugen Hoyos
be2cf98a75 Force ebp_available for icc.
See discussion:
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/86209

Originally committed as revision 17985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 13:22:41 +00:00
Diego Biurrun
60a847b5db cosmetics: Remove file name from file header.
Originally committed as revision 17984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 12:46:07 +00:00
Baptiste Coudurier
3c6547bede add my gpg key fingerprint
Originally committed as revision 17983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 11:21:11 +00:00
Attila Kinali
08519772a1 add my gpg key fingerprint
Originally committed as revision 17982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 11:18:52 +00:00
Baptiste Coudurier
7c4502c8c4 typo in the mail, the 4am commit is always the worst
Originally committed as revision 17981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:53:12 +00:00
Baptiste Coudurier
4909e517fd cosmetics
Originally committed as revision 17980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:52 +00:00
Baptiste Coudurier
983bdd3788 add my copyright in mov de/muxer
Originally committed as revision 17979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:28 +00:00
Stefano Sabatini
7867978374 Expand "lsb" to "least significant bits".
Originally committed as revision 17978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:37:25 +00:00
Stefano Sabatini
e5681ba0f2 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
2009-03-15 10:33:51 +00:00
Baptiste Coudurier
e49da8273b allocate palette in codec directly
Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:44:57 +00:00
Baptiste Coudurier
6c00a9dec2 cosmetics, add some whitespaces and empty lines
Originally committed as revision 17975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:06:36 +00:00
Kostya Shishkov
0304109df6 Correct MV prediction for B-frame blocks in RV4 decoder
Originally committed as revision 17974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 08:21:42 +00:00
Baptiste Coudurier
3d45a83a59 add loglevel option to set libav* logging level, -v does not set it anymore
Originally committed as revision 17973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 07:23:18 +00:00
Baptiste Coudurier
f0f2218dce do not modify sample_count, check against index entries
Originally committed as revision 17972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 07:21:22 +00:00
Baptiste Coudurier
ed6ae6a58b use utc time for timestamp and do not set it if not specified
Originally committed as revision 17971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 23:39:52 +00:00
Måns Rullgård
9bceffef3a Fix ff_random_get_seed() prototype
Originally committed as revision 17970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 23:00:57 +00:00
Baptiste Coudurier
36a12218db swf timestamps are 16 bits
Originally committed as revision 17969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:51:38 +00:00
Baptiste Coudurier
40a1d41fd2 remove unused fields in swf context
Originally committed as revision 17968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:49:01 +00:00
Baptiste Coudurier
2261a952f9 do not parse timestamp if bitexact is set, should fix regression tests
Originally committed as revision 17967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:43:28 +00:00
Reimar Döffinger
881dad9e76 Enable generic index creation and seeking for NUV demuxer.
Originally committed as revision 17966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 22:07:15 +00:00
Reimar Döffinger
74f5ae847d Add AVFMT_GENERIC_INDEX support also for formats that do not use a parser.
Originally committed as revision 17965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 21:46:00 +00:00
Reimar Döffinger
bd36f175ab 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
2009-03-14 20:50:54 +00:00