generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,082 Commits 24 Branches 241 Tags
Commit Graph

6031 Commits

Author SHA1 Message Date
Chris Evans
88ea7ca627 oggdec: prevent heap corruption. 
Specifically crafted samples can reinit ogg->streams[] while
reading samples, and thus we should not cache old pointers since
these may no longer be valid.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry-picked from commit 4cc3467e7abfea7e8d03b6af511f7719038a5a98)
 2011-08-04 22:01:25 +02:00
Reinhard Tartler
9848e1be2d lavf: inspect more frames for fps when container time base is coarse 
As per issue2629, most 23.976fps matroska H.264 files are incorrectly
detected as 24fps, as the matroska timestamps usually have only
millisecond precision.

Fix that by doubling the amount of timestamps inspected for frame rate
for streams that have coarse time base. This also fixes 29.970 detection
in matroska.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 78431098f9e306ebe27e7698d0ae539e3df2afe9)

Tested with mplayer based on this report
http://thread.gmane.org/gmane.comp.video.mplayer.user/66043/focus=66063

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 7c152a458d3fb0a2fb1aef1f05bfee90fe70697e)
 2011-04-30 08:18:32 +02:00
Janne Grunau
dda2062c31 consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2c3589bfda036c7827ded0bf38b16dfe7630bae1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-03-18 17:47:01 +01:00
Janne Grunau
5d01cd8429 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 348b8218f7a59374355c966dbe3b851a7275f952)
 2011-03-18 17:46:29 +01:00
Kostya
f9bf2a4ab1 Do not attempt to decode APE file with no frames 
This fixes invalid reads/writes with this sample:
http://packetstorm.linuxsecurity.com/1103-exploits/vlc105-dos.txt
(cherry picked from commit 8312e3fc9041027a33c8bc667bb99740fdf41dd5)
 2011-03-18 17:02:34 +01:00
Reinhard Tartler
93883b0c39 aviobuf: Do short seeks forward by reading and skipping data instead of a proper seek 
This improves performance on e.g. seekable http.


backport r24280 by mstorsjo


Originally committed as revision 24335 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-07-19 19:51:29 +00:00
Google
9d1213912f Add VP80 fourcc 
Patch by Google

backport r23193 by conrad


Originally committed as revision 23863 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-28 20:38:36 +00:00
Reinhard Tartler
edf5072fea Doxygen av_codec_get_id() and av_codec_get_tag(). 
backport r23102 by stefano


Originally committed as revision 23801 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-26 15:32:27 +00:00
Reinhard Tartler
522f1861ca Add compatibility wrappers for functions moved from lavf to lavc 
When symbol versioning is enabled, moving symbols from one library to
another breaks binary compatibility.  This adds wrappers with the old
version tag for the av_*packet functions recently moved to lavc.

backport r23611 by mru


Originally committed as revision 23613 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-15 13:31:27 +00:00
Reinhard Tartler
44f91788a5 revert r23610, better patch is pending 
Originally committed as revision 23612 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-15 13:29:20 +00:00
Reinhard Tartler
03b47bb8d7 add symver hacks for gnu linkers 
this patch restores binary compatibility for the av_*_packet symbols that have
been moved from libavformat to libavcodec.  This patch works for gnu toolchains
only; support for ARM RCVT will be handed in for a later point release as soon
as the patch is ready and approved by the ARM maintainer(s).


Originally committed as revision 23610 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-15 12:29:19 +00:00
James Zern
db06ddf8c6 Add WebM muxer 
Patch by James Zern <jzern at google>

backport r23474 by conrad


Originally committed as revision 23549 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-06-09 15:54:27 +00:00
Reinhard Tartler
55291e37f5 Samsung uses SIPP as FourCC for MPEG-4 ASP. 
backport r23309 by cehoyos


Originally committed as revision 23384 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:45:13 +00:00
Google
9052b5b73b matroska: Add V_VP8 
Patch by Google

backport r23192 by conrad


Originally committed as revision 23376 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 14:11:03 +00:00
Reinhard Tartler
df62b0d9f5 Display a more descriptive log message when probe buffer limit is 
reached.



backport r23288 by jai_menon


Originally committed as revision 23373 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-29 13:11:56 +00:00
Reinhard Tartler
7920dc8802 matroskaenc: Write codec time base as default duration for video tracks. 
This isn't exactly semantically equivalent, but the field has already been
long abused to mean this, and writing it helps in determining a decent cfr
time base when transcoding from a mkv where the video codec stores none (VP8).

backport r23284 by conrad


Originally committed as revision 23365 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-28 20:35:13 +00:00
Reinhard Tartler
057287c9cd Reduce the score for the aea demuxer probing function. 
backport r23273 by banan


Originally committed as revision 23356 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-27 20:48:19 +00:00
Reinhard Tartler
1746657479 Fix detection of some stereo atrac files by not comparing the 
block size mode and info byte.


backport r23272 by banan


Originally committed as revision 23355 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-27 20:47:48 +00:00
Reinhard Tartler
0ff244dea2 write 3gp perf tag for artist metadata 
backport r23268 by bcoudurier


Originally committed as revision 23354 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-27 20:47:03 +00:00
Reinhard Tartler
0078216f07 change author metadata to artist in mov de/muxer 
backport r23266 by bcoudurier


Originally committed as revision 23353 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-27 20:40:09 +00:00
Reinhard Tartler
b5afece607 matroskaenc: Don't write track timecode scale 
It's not required for mkv and unsupported in webm

backport r23247 by conrad


Originally committed as revision 23315 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-25 18:22:30 +00:00
Reinhard Tartler
6ae05f541a matroskadec: Allow unknown EBML doctype 
backport r23246 by conrad


Originally committed as revision 23314 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-25 18:21:59 +00:00
James Zern
9d3bb3501d matroskadec: Support webm doctype 
Patch by James Zern <jzern at google>

backport r23245 by conrad


Originally committed as revision 23313 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-25 18:20:59 +00:00
Diego Biurrun
a2a26d108b Enable AVFMT_GENERIC_INDEX for Ogg demuxer. This avoids the many 
seeks needed for binary search when seeking to a previously seen
location.

backport r23279 by reimar


Originally committed as revision 23282 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-24 02:09:36 +00:00
Reinhard Tartler
327afd42b4 In ogg muxer, pack multiple frames into one page, much lower overhead 
backport r23231 by bcoudurier


Originally committed as revision 23263 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-23 19:12:27 +00:00
Martin Storsjö
c9b841c2b1 Late bump of the minor version, for the addition of AVFMT_FLAG_RTP_HINT 
backport r23179 by mstorsjo


Originally committed as revision 23240 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 21:48:17 +00:00
Martin Storsjö
1dea5cfbb0 Use a heuristic for describing the RTP packets using sample data 
backport r23165 by mstorsjo


Originally committed as revision 23238 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 21:46:52 +00:00
Martin Storsjö
d48539fb85 Add initial support for RTP hinting in the mov muxer 
backport r23164 by mstorsjo


Originally committed as revision 23237 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 21:46:23 +00:00
Martin Storsjö
a14f86aac7 Make mov_write_packet non-static, add ff_ prefix 
backport r23163 by mstorsjo


Originally committed as revision 23236 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 21:45:54 +00:00
Martin Storsjö
6438cb834c Move the mov muxer structures to a separate header 
backport r23162 by mstorsjo


Originally committed as revision 23235 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 21:45:21 +00:00
Martin Storsjö
ed2b1f80fa Add a flag for enabling RTP hinting 
backport r23161 by mstorsjo


Originally committed as revision 23234 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 21:44:43 +00:00
Martin Storsjö
3d24c2ce02 Make ff_sdp_write_media a lavf-internal function 
This is in preparation for RTP hinting in the MOV muxer, where
it needs to be able to create SDP fragments for each media stream.


backport r23160 by mstorsjo


Originally committed as revision 23233 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 21:43:40 +00:00
Reinhard Tartler
7d8b893b7e Disable non interleaved avi code when there is no index available. 
Fixes issue1956.


backport r23202 by michael


Originally committed as revision 23230 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 20:24:08 +00:00
Reinhard Tartler
3588e6b7c5 Fix a crash when opening WMS RTSP streams 
Fixes issue 1948


backport r23181 by mstorsjo


Originally committed as revision 23228 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 20:22:18 +00:00
Janne Grunau
b9a35435a5 In ts demuxer, output pes packet as soon as they are complete. 
This is needed for subtitles where packets are infrequent.
Patch by Janne Grunau, janne-ffmpeg at jannau dot net.


backport r23157 by bcoudurier


Originally committed as revision 23226 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 20:15:53 +00:00
Reinhard Tartler
85ed859e6b set avg frame rate in mkv demuxer 
backport r23152 by bcoudurier


Originally committed as revision 23225 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 20:13:34 +00:00
Reinhard Tartler
a7216204eb Change MAX_READ_SIZE message during av_find_stream_info to DEBUG level. 
It is not harmful and it scares too many users.


backport r23139 by bcoudurier


Originally committed as revision 23221 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-21 18:46:03 +00:00
Reinhard Tartler
d1026ab506 Make the nut demuxer issue a more meaningful error message if it 
cannot recognize the provided codec tag.

backport r23071 by stefano


Originally committed as revision 23205 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-20 22:46:11 +00:00
Reinhard Tartler
ba9cecf5e5 Favor chunk size over hitting the correct position after reading the chunk size in asf. 
Fixes issue1923


backport r23040 by michael


Originally committed as revision 23185 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 11:44:45 +00:00
Reinhard Tartler
0db6f6cfed movenc: Write QuickTime chapters 
backport r23022 by conrad


Originally committed as revision 23173 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 08:02:33 +00:00
Reinhard Tartler
9d08b20fea movenc: Swap positions of mov_write_header and mov_write_packet 
backport r23021 by conrad


Originally committed as revision 23172 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 08:02:05 +00:00
Reinhard Tartler
a03dcb9682 mov: Read nero chapters 
backport r23020 by conrad


Originally committed as revision 23171 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-19 07:58:17 +00:00
Reinhard Tartler
64c2076bfc update version string in changelog 
Originally committed as revision 23114 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
 2010-05-13 16:26:55 +00:00
David Conrad
ddb630177a movenc: Write QuickTime chapters 
Originally committed as revision 23022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 08:41:10 +00:00
David Conrad
1b206f62ea movenc: Swap positions of mov_write_header and mov_write_packet 
Originally committed as revision 23021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 08:41:06 +00:00
David Conrad
1cf9f6ed4f mov: Read nero chapters 
Originally committed as revision 23020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-05 08:41:01 +00:00
Thierry Foucu
e1954bb5ca Do not use pkt->size when it is potentially uninitialized. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 23017 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-04 17:17:16 +00:00
Reimar Döffinger
c99d506b3b Fix off-by-one errors in description of score_max argument for 
av_probe_input_format2

Originally committed as revision 23004 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 15:36:51 +00:00
Reimar Döffinger
8e2ee182fa Export av_probe_input_format2. 
Originally committed as revision 23002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-01 13:49:35 +00:00
Michael Niedermayer
2308b6c19a Add version to AVClass so we can add to and use fields of AVClass without ABI issues. 
Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-28 20:00:23 +00:00