1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00

4631 Commits

Author SHA1 Message Date
Reinhard Tartler
ef84190a1a Fix possible buffer over-read in vorbis_comment, fix it double to be sure.
First, make s signed, so that comparisons against end - p will not be made as
unsigned, making the check incorrectly pass if p is beyond end.
Also ensure that p will never be > end, so the code is correct also if
buf is not padded.

backported r20014 by reimar


Originally committed as revision 21711 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
2010-02-09 18:51:11 +00:00
Reinhard Tartler
7db16a8173 check stream existence before assignment, fix #1222
backported r19259 by bcoudurier



Originally committed as revision 21710 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
2010-02-09 18:44:49 +00:00
Reinhard Tartler
e91ba7dc9d add one missing check for stream existence in read_elst, fix #1364
backported patch r19792 by bcoudurier




Originally committed as revision 21709 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
2010-02-09 18:41:17 +00:00
Reinhard Tartler
95f90d27d2 Disable parsing for ogg streams where no ogg header was found,
if no header was found the parser was not initialized and thus will
crash when trying to use it.



Originally committed as revision 21708 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
2010-02-09 18:24:30 +00:00
Reinhard Tartler
1e9ac36f66 Make arguments of av_set_pts_info() unsigned.
Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1



Originally committed as revision 21707 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
2010-02-09 18:10:07 +00:00
Reinhard Tartler
a9785f58c6 backport symbol versioning patch
Originally committed as revision 21595 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
2010-02-01 16:00:09 +00:00
Baptiste Coudurier
07679e680c revert r16717, r16718, r16719, EAGAIN handling, this causes FFserver to hang
Originally committed as revision 17737 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
2009-03-02 20:32:24 +00:00
Diego Biurrun
0ffbc258aa Change a bunch of codec long_names to be more consistent and descriptive.
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-02 05:18:33 +00:00
Aurelien Jacobs
827f7e285b deprecate old metadata API
Originally committed as revision 17690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 16:35:25 +00:00
Aurelien Jacobs
bc718b4720 fix missed usage of old metadata API in mov demuxer
Originally committed as revision 17689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 16:06:26 +00:00
Aurelien Jacobs
012867f05b use new metadata API in libavformat/utils.c
Originally committed as revision 17687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 15:38:06 +00:00
Aurelien Jacobs
feacba6c26 use new metadata API in r3d demuxer
Originally committed as revision 17686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 15:28:56 +00:00
Aurelien Jacobs
ec26457064 new metadata API is now officially part of public API
Originally committed as revision 17682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 14:50:03 +00:00
Aurelien Jacobs
95030323d1 simplify metadata conversion and fixes gcc-2.95 at the same time
Originally committed as revision 17681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 14:29:30 +00:00
Michael Niedermayer
4022fe01a6 Change the timebase of the raw demuxer to one that can represent the ts of fields.
Originally committed as revision 17675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 03:48:35 +00:00
Michael Niedermayer
9e6c124a87 Disable MPEG-1/2 style timestamp calculation for H264. It still randomizes
the timestamps because delay is not known for the first few frames.

Originally committed as revision 17674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 03:17:24 +00:00
Aurelien Jacobs
719e721a14 Add some basic metadata conversion tables for matroska and asf.
Add missing const qualifiers for metadata_conv in AV{In|Out}putFormat.

Originally committed as revision 17671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 00:12:08 +00:00
Aurelien Jacobs
f610a9f284 add a metadata conversion API
Originally committed as revision 17670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 23:34:16 +00:00
Luca Abeni
3aa7ac6dd2 Document ff_rtp_codec_id()
Originally committed as revision 17666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 19:34:50 +00:00
Ivan Schreter
4c6b49bf74 Change TS seeking so it returns position/timestamp of a key frame.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 18:35:53 +00:00
Luca Abeni
d3da8a4565 Fix typo in a comment
Originally committed as revision 17664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 18:23:19 +00:00
Luca Abeni
c3efd98c09 Document ff_rtp_enc_name()
Originally committed as revision 17663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 18:21:43 +00:00
Justin Ruggles
344bcea46d cosmetics: indentation
Originally committed as revision 17662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 17:31:25 +00:00
Luca Abeni
d3a5794958 Document ff_rtp_get_codec_info()
Originally committed as revision 17661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 17:24:56 +00:00
Justin Ruggles
81f052cb7d Separate the raw FLAC demuxer from raw.c and put in a new file,
flacdec.c.

Originally committed as revision 17660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 17:24:46 +00:00
Ronald S. Bultje
2d243fb3fc Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
in mov.c for the demuxer. See "[PATCH] rename movenc.c MOVContext to
MOVMuxContext" thread on the mailinglist.

Originally committed as revision 17659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 16:02:29 +00:00
Måns Rullgård
f166f2f435 Revert "Improve frame rate guessing for streams with two fields per frame."
This reverts r17656, which broke many tests.  Further investigation
is necessary.

Originally committed as revision 17658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 15:15:54 +00:00
Ivan Schreter
5fa61b26f7 Improve frame rate guessing for streams with two fields per frame.
Patch by Ivan Schreter, schreter gmx net

Originally committed as revision 17656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 13:14:46 +00:00
Aurelien Jacobs
73914d56d9 use new metadata API in nut muxer
This is only a straight conversion of current code, so for now, it won't
mux generic metadata. It will only mux Title, Author and Copyright.

Originally committed as revision 17653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 23:12:14 +00:00
Aurelien Jacobs
00798e4563 use new metadata API in nut demuxer
Originally committed as revision 17652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 23:10:34 +00:00
Reimar Döffinger
fe02d9e719 Do not allow standard-frame-rate detection to increase the value of
r_frame_rate by more than 1% over a previously set/detected value.

Originally committed as revision 17641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 14:13:15 +00:00
Reimar Döffinger
03c03afde7 Simplify ipmovie.c pts calculation by using an appropriate time_base.
Originally committed as revision 17639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 10:07:12 +00:00
Benoit Fouet
f3592353ce Add a context to av_log() call.
Originally committed as revision 17638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:31:20 +00:00
Reimar Döffinger
3bc5f6f9a6 Hack: #undef printf so compilation works with DEBUG_IPMOVIE set to 1
Originally committed as revision 17632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:02:34 +00:00
Reimar Döffinger
8514272472 Detect the case when the time base is exact but far finer than necessary to
represent the time stamps, as e.g. for ipmovie.c and set a better r_frame_rate.

Originally committed as revision 17631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 07:56:24 +00:00
Michael Niedermayer
3797c74ba5 Add ticks_per_frame, this should hopefully fix the regressions caused
by the time_base change.

Originally committed as revision 17630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 23:47:32 +00:00
Aurelien Jacobs
83569729d4 cosmetics: vertical alignment
Originally committed as revision 17629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:39:53 +00:00
Aurelien Jacobs
b8222b3d9c use new metadata API in rpl demuxer
Originally committed as revision 17628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:38:46 +00:00
Aurelien Jacobs
0d2e86d7ae use new metadata API in wc3 demuxer
Originally committed as revision 17627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:35:26 +00:00
Stefano Sabatini
3f4c2bf99b Mark as "internal but installed" the avio.h file.
This should prevent its direct inclusion in an external project, which
results broken if avformat.h is not included before.

Originally committed as revision 17626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:34:18 +00:00
Stefano Sabatini
aafe9b635e Add a @file notice to avio.h.
Originally committed as revision 17625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:28:42 +00:00
Aurelien Jacobs
17af052531 move static tables from asf.h to non-static tables in asf.c
this avoid getting those tables duplicated in asfenc.o and asfdec.o

Originally committed as revision 17619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 16:17:17 +00:00
Aurelien Jacobs
5e293c424d rename asf-enc.c to asfenc.c and asf.c to asfdec.c for consistency
Originally committed as revision 17618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 15:44:19 +00:00
Aurelien Jacobs
6352c6bb63 fix a memleak in av_metadata_set()
Originally committed as revision 17617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:40:04 +00:00
Ronald S. Bultje
144ae29dde Implement marker bit, which is used for several RTP payloads currently
under review. See "[FFmpeg-devel] RTP mark bit not passed to parse_packet"
thread on mailinglist.

Originally committed as revision 17616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:24:50 +00:00
Ronald S. Bultje
a68d44ed6f Don't (ab)use PKT_FLAG_* in RTP code, since the two have virtually nothing
in common except for this one value. Change was requested by Luca in the
"[FFmpeg-devel] RTP mark bit not passed to parse_packet" thread.

Originally committed as revision 17615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:23:05 +00:00
Ronald S. Bultje
26d6b3e230 Document rtsp.h, see "[PATCH] document rtsp.h" thread.
Originally committed as revision 17614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 14:15:41 +00:00
Aurelien Jacobs
d9fc9ff31b movenc: add muxing of language along with metadata tags when available
Originally committed as revision 17612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:13:48 +00:00
Aurelien Jacobs
2904fd398f return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking
Originally committed as revision 17611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:11:18 +00:00
Aurelien Jacobs
b97fb809b8 cosmetics: indentation
Originally committed as revision 17610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:08:22 +00:00