1
0
Fork 0
Commit Graph

24055 Commits

Author SHA1 Message Date
Reinhard Tartler e33f58af5a update version for 0.6.1
Originally committed as revision 25469 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-13 12:44:47 +00:00
Reinhard Tartler 540c6cca6e add note about flic fix (CVE-2010-3429) to RELEASE notes
Originally committed as revision 25468 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-13 12:43:18 +00:00
Reinhard Tartler 08f5b2464d add note about flic fix (CVE-2010-3429)
Originally committed as revision 25467 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-13 12:42:38 +00:00
Reinhard Tartler 79a16f0cac Fix several security issues in flicvideo.c
This fixes CVE-2010-3429


backport r25223 by michael


Originally committed as revision 25307 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-02 07:42:42 +00:00
Reinhard Tartler 9ad774ff33 property changes from the AAC backport
Originally committed as revision 25306 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-10-02 07:35:56 +00:00
Reinhard Tartler 84149812a6 clarify addition of VP80 fourcc code
Originally committed as revision 24636 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-31 21:56:15 +00:00
Reinhard Tartler d41187cb9e update release notes for the upcoming 0.6.1 point release
Originally committed as revision 24635 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-31 21:55:38 +00:00
Reinhard Tartler 094e849f32 update changelog for upcoming 0.6.1 point release
Originally committed as revision 24633 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-31 21:13:20 +00:00
Reinhard Tartler ba90f93852 Backport AAC-HE v2 from trunk
This patch has seen testing for a couple of weeks in ubuntu maverick and debian/experimental w/o negative feedback so far.



Originally committed as revision 24576 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-28 20:14:28 +00: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
Reinhard Tartler 61eb165514 ac3: make the value of codec_id during (E-)AC-3 parsing stay CODEC_ID_EAC3
if any E-AC-3 frames have been detected instead of switching back and forth for
AC-3 core + dependent E-AC-3 substream(s).
Fixes Issue 2022.

backport r24103 by jbr


Originally committed as revision 24136 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-07-09 01:16:42 +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
Jean-Daniel Dupas 32fa7cecd7 Some fields were incorrectly reset (to NULL) when calling avcodec_copy_context().
Patch by Jean-Daniel Dupas, devlists shadowlab org 


backport r23344 by cehoyos


Originally committed as revision 23793 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-26 14:24:14 +00:00
Reinhard Tartler b9ebd7dc7d 10l: aacsbr: Fix f_master[2] calculation when k2diff == -1.
backport r23660 by alexc


Originally committed as revision 23747 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-24 05:46:58 +00:00
Diego Biurrun 55b6e09e5e Fix two small typos.
Originally committed as revision 23678 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-21 09:17:19 +00:00
Reinhard Tartler aa48d9e64c remove note that libvpx was considered (L)GPL incompatible
Originally committed as revision 23623 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-16 06:10:30 +00:00
Reinhard Tartler d7e98ea6ac configure: fix symver detection with icc 10
Apparently the compiler sometimes bypasses the normal assembler, in
which case the asm label variant works.  If the file contains any
inline asm, this bypassing is not done, and the assembler chokes on
invalid syntax.  Inserting a dummy asm() statement in the test when
the compiler supports it makes sure no shortcuts are taken and the
test fails as it should.

backport r23616 by mru


Originally committed as revision 23618 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-15 19:44:30 +00:00
Reinhard Tartler 8182bcae90 Fix symbol version compat wrappers on systems with export prefixes
backport r23615 by mru


Originally committed as revision 23617 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-15 19:44:09 +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
Reinhard Tartler 05b4e4fe49 remove redundant changelog entry
Originally committed as revision 23560 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-10 08:10:32 +00:00
Reinhard Tartler 3229bf8573 librtmp may link to different ssl implementations
Make sure we link using the right libs by using pkg-config



backport r23511 by lu_zero


Originally committed as revision 23550 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-09 15:55:02 +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 eb4b8b96fc libvpx now has an (L)GPL-compatible license.
backport r23482 by diego


Originally committed as revision 23487 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-05 13:58:13 +00:00
Reinhard Tartler 373010971e update RELEASE notes
VP8 license issues seem to have solved, plus include wording suggestion
from discussion on -cvslog


Originally committed as revision 23483 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-05 08:30:55 +00:00
James Zern c3cd8890fe VP8 encoding via libvpx.
Patch by James Zern, Google, Inc.


backport r23449 by cehoyos


Originally committed as revision 23455 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-03 21:36:38 +00:00
Reinhard Tartler 20d4a1f020 Add an entry to APIchanges for the addition of sws_convertPalette8ToPacked32 -24
backport r23415 by siretart


Originally committed as revision 23446 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-03 20:16:42 +00:00
Reinhard Tartler e5880b3f24 updates: introductionary and more general notes, add missing items from changelog
Originally committed as revision 23420 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-02 09:25:37 +00:00
Reinhard Tartler 4b51239df3 disable (native) vorbis encoder for the 0.6 branch
Originally committed as revision 23416 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-01 20:14:00 +00:00
Reinhard Tartler 4979362ae4 ffmpeg: offer alternatives for experimental codecs if they exist
backport r23398 by janne


Originally committed as revision 23400 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-01 06:29:50 +00:00
Reinhard Tartler 0546386dff ffmpeg: fail if user selected codec is experimental and strict_std_compliance > experimental
backport r23397 by janne


Originally committed as revision 23399 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-06-01 06:28:19 +00:00
Reinhard Tartler 70ea5176a5 Add a short note about libvpx.
backport r23394 by diego


Originally committed as revision 23395 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-31 21:49:53 +00:00
Diego Biurrun 661092004f Require --enable-nonfree flag for libvpx.
The license of libvpx is incompatible with the (L)GPL.  As long as this is
the case, the only way to use it is by marking the result as nonfree.

backport r23371 by diego


Originally committed as revision 23390 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-30 22:25:40 +00:00
Reinhard Tartler f7f9f18f83 Treat SIPP like xvid, fixed issue1966
backport r23336 by michael


Originally committed as revision 23385 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 15:07:08 +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
Reinhard Tartler 1f1d2fa75c ffserver: Send a Content-Base header in the reply to RTSP DESCRIBE requests
This is needed for QuickTime Player to be able to connect properly.


backport r23325 by mstorsjo


Originally committed as revision 23383 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:41:26 +00:00
Reinhard Tartler 2a546cecbf backport latest ffserver fixes like memory leaks and invalid reads
Patches by Howard Chu, hyc at highlandsun dot com


backport r23290-23295 by mstorsjo


Originally committed as revision 23382 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:40:31 +00:00
Reinhard Tartler 8f3504c3ca Mark vorbis encoder as experimental.
backport r23339 by cehoyos


Originally committed as revision 23381 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:34:37 +00:00
Reinhard Tartler bf20d5e4bb Mark AAC encoder as experimental.
backport r23350 by alexc


Originally committed as revision 23380 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:33:50 +00:00
Janne Grunau 3fa19f6828 Add CODEC_CAP_EXPERIMENTAL and prefer encoders without it.
Patch by Janne Grunau, janne-ffmpeg jannau net 


backport r23334,23337-23338 by cehoyos and stefano


Originally committed as revision 23379 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:33:02 +00:00
Reinhard Tartler 4e62a67389 Check for VUI overeading and reset num_reoder_frames.
This helps the video from issue1831


backport r23328 by michael


Originally committed as revision 23378 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:25:18 +00:00
Reinhard Tartler 46ac6315fd api-example: Try to avoid decoding incomplete frames
Use a larger input audio buffer, refill it when it has less than 4 KB data
left.


backport r23323 by mstorsjo


Originally committed as revision 23377 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:20:05 +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 9181adff9c Fix VP8 listing in general.texi
backport r23306 by mstorsjo


Originally committed as revision 23375 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:05:05 +00:00
James Zern 8261cce1f0 VP8 decoding via libvpx
Patch by James Zern for Google, Inc., jzern google com

backportd r23191,23303,23307-23308 by conrad, cehoyos and mstorsjo

Originally committed as revision 23374 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 14:03: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
Cyril Russo e63d03e7e2 Fix documentation of av_audio_convert.
Patch by Cyril Russo, stage D nexvision A laposte net


backport r23285 by cehoyos


Originally committed as revision 23372 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
2010-05-29 13:11:21 +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