1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

18674 Commits

Author SHA1 Message Date
Michael Niedermayer
7ed673af71 Print timing_info on -debug 1.
Originally committed as revision 17949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 14:10:49 +00:00
Reimar Döffinger
90a30ad59f Add "testclean" target to .PHONY
Originally committed as revision 17948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 13:51:52 +00:00
Kostya Shishkov
923ed9748c Fix direct and skip MB motion compensation in RV4:
two conditions were incomplete and zeroing motion
vectors was performed only on half of them.

Originally committed as revision 17947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 13:48:44 +00:00
Reimar Döffinger
abb785f19e Simplify RoQ demuxer pts calculation by using a appropriate time bases.
Originally committed as revision 17946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-13 13:37:35 +00:00
Reimar Döffinger
15969b55d1 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
2009-03-12 11:47:50 +00:00
Baptiste Coudurier
fc34a08d77 remove sws_flags, seems to have no effect
Originally committed as revision 17944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-12 03:17:36 +00:00
Alex Converse
f11c9ee996 patcheck: Replace non-POSIX echo -e with printf.
Originally committed as revision 17943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 19:13:15 +00:00
Cédric Schieli
fe91924dd7 Make MMX registers parametrized in the YSCALEYUV2PACKEDX_YA macro
Originally committed as revision 28934 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-03-11 14:44:22 +00:00
Cédric Schieli
c662e788ce 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
2009-03-11 14:22:53 +00:00
Gwenole Beauchesne
cd823ff950 Use av_mallocz() to initialize hwaccel_data_private.
Originally committed as revision 17942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:25:00 +00:00
Baptiste Coudurier
27ad7d3a96 stag option to force subtitle tag
Originally committed as revision 17941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:14:19 +00:00
Baptiste Coudurier
d168b3fd2d reindent
Originally committed as revision 17940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:05:18 +00:00
Baptiste Coudurier
7943a90a0d keep original tag when stream copying subs with ipod format
Originally committed as revision 17939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:04:44 +00:00
Baptiste Coudurier
c569bd0632 ipod supports both subs tags
Originally committed as revision 17938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:03:42 +00:00
Baptiste Coudurier
80357cfcfb reindent
Originally committed as revision 17937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:02:59 +00:00
Baptiste Coudurier
9f52055463 write correct atoms based on tag and not format, fixes subs stream copy
Originally committed as revision 17936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:01:39 +00:00
Baptiste Coudurier
d1df4da00b use correct codec tag list for ipod format
Originally committed as revision 17935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:59:38 +00:00
Baptiste Coudurier
b686d0ab4b mxf and mxf d10 regression tests
Originally committed as revision 17934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:16:19 +00:00
Baptiste Coudurier
f344ae8096 again 10l, typo, put_byte instead of put_buffer
Originally committed as revision 17933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:48:02 +00:00
Baptiste Coudurier
cafdc1876a attempt to try to generate an random umid
Originally committed as revision 17932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:15:00 +00:00
Baptiste Coudurier
00b7fbdcf5 10l, set ret to 0 when finished
Originally committed as revision 17931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:13:14 +00:00
Baptiste Coudurier
002c95d749 dump_format after av_write_header to print updated parameters
Originally committed as revision 17930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:06:18 +00:00
Baptiste Coudurier
a2523ce2e2 fix subs track height, set track->height to codec height if not set
Originally committed as revision 17929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:04:56 +00:00
Ben Littler
3596f4e076 sn40 avi fourcc decodes with ffodivx
Originally committed as revision 17928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 01:36:25 +00:00
Stefano Sabatini
8358c03479 Fix typos.
Originally committed as revision 17927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-10 21:41:31 +00:00
Vitor Sessak
e40ee25c49 Fix bug when elbg->utility_inc[elbg->numCB-1] == 1
Originally committed as revision 17926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-10 17:38:16 +00:00
Gwenole Beauchesne
eb2c24232f Add REGISTER_HWACCEL() for hardware accelerators.
Originally committed as revision 17925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-10 14:35:55 +00:00
Ronald S. Bultje
b5b9ff2a1f 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
2009-03-10 12:55:29 +00:00
Diego Biurrun
5e622c401f Replace all `` by $(), the latter can be nested more easily.
Originally committed as revision 17923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 23:59:31 +00:00
Diego Biurrun
5fd89ca03f Fix MMX2 check, 'movss' is not an MMX2 instruction, use 'pmaxub' instead.
Originally committed as revision 17922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 23:33:27 +00:00
Måns Rullgård
f49568a467 Fix unaligned access in ff_copy_bits()
Originally committed as revision 17921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 23:27:38 +00:00
Måns Rullgård
75800dce2b Set AS to $CC by default, override with gcc only when CC is armcc
Originally committed as revision 17920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 22:39:49 +00:00
Ronald S. Bultje
b8cc5a9fdf 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
2009-03-09 22:03:47 +00:00
Ronald S. Bultje
7ccefd08f6 Revert to r17908.
Originally committed as revision 17918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 22:02:06 +00:00
Reynaldo H. Verdejo Pinochet
d2af569710 Cosmetics from Kenan Gillet's 'extract and share weighted_vector_sumf'
patchset. Just a reindent.

Originally committed as revision 17917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 22:00:35 +00:00
Reynaldo H. Verdejo Pinochet
95e8325771 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
2009-03-09 21:55:24 +00:00
Ronald S. Bultje
88c4339bda Move MOVContext and related structures from mov.c to isom.h. See "[PATCH]
move MOVContext from mov.c to isom.h" thread on ML.

Originally committed as revision 17915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 21:53:00 +00:00
Reimar Döffinger
3898eed890 Reorder arguments for av_fifo_generic_read to be more logical and
consistent with av_fifo_generic_write.

Originally committed as revision 17914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 17:47:47 +00:00
Reimar Döffinger
60f75ad245 Fix seek regression test broken by r17905, seeking fails completely
for swf before and after, but it now incorrectly creates additional
streams.

Originally committed as revision 17913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 17:44:57 +00:00
Kostya Shishkov
bcff32d1b4 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
2009-03-09 17:25:43 +00:00
Gwenole Beauchesne
2500d8bea6 Update VA API pixfmts documentation: struct vaapi_render_state
shall now be copied to Picture.data[3].

Originally committed as revision 17912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 15:52:45 +00:00
Reimar Döffinger
29a68cf04e Convert spurious DOS line breaks to UNIX line breaks in seek regression
test reference file.

Originally committed as revision 17911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 15:38:08 +00:00
Ronald S. Bultje
0ecf9cc900 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
2009-03-09 13:08:19 +00:00
Ronald S. Bultje
21b3752932 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
2009-03-09 12:46:32 +00:00
Ronald S. Bultje
dc3685e129 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
2009-03-09 12:42:53 +00:00
Reimar Döffinger
d71d64dcc1 Mark all packets from nuv demuxer as keyframes in order to make seeking work.
For proper seeking, they should be set correctly though.

Originally committed as revision 17907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 12:25:13 +00:00
Ronald S. Bultje
37b7dac184 Reorder alphabetically after r17902.
Originally committed as revision 17906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 12:06:47 +00:00
Reimar Döffinger
3a4f91f5ed 100l, to start reading from the first frame we must seek to data_offset,
not 0 in av_seek_frame_generic.

Originally committed as revision 17905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 12:06:31 +00:00
Reimar Döffinger
fb2e95c97a Set AVPacket pos also for audio packets in nuv demuxer.
Originally committed as revision 17904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 11:35:59 +00:00
Diego Biurrun
082dea8e40 Remove all remaining code that was disabled through the major version bump.
Originally committed as revision 17903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 10:24:47 +00:00