ffmpeg.git
9 years agofix 'seektest' again v0.5.1
Reinhard Tartler [Tue, 2 Mar 2010 16:03:06 +0000 (16:03 +0000)]
fix 'seektest' again

backport  r19270 by rbultje:

Remove any reference to ASFContext.packet_size and replace it with
AVFormatContext.packet_size. See "[PATCH] asf*.c/h: use
AVFormatContext->packet_size instead of own copy" thread on ML.

and r19361 by reimar:

Check for packet_length 0, it is already treated as invalid by the padding check,
but that resulted in a confusing/wrong error message.

Originally committed as revision 22147 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoBump version to 0.5.1.
Diego Biurrun [Tue, 2 Mar 2010 14:43:01 +0000 (14:43 +0000)]
Bump version to 0.5.1.

Originally committed as revision 22146 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoMention licensing-related changes; some whitespace adjustments.
Diego Biurrun [Tue, 2 Mar 2010 14:25:48 +0000 (14:25 +0000)]
Mention licensing-related changes; some whitespace adjustments.

Originally committed as revision 22145 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoIf we are using partial release names we might as well try to be funny.
Diego Biurrun [Mon, 1 Mar 2010 18:03:53 +0000 (18:03 +0000)]
If we are using partial release names we might as well try to be funny.

Originally committed as revision 22134 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoAdd release managers, merged from trunk.
Diego Biurrun [Mon, 1 Mar 2010 17:58:50 +0000 (17:58 +0000)]
Add release managers, merged from trunk.

Originally committed as revision 22133 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoamend release notes for 0.5.1
Reinhard Tartler [Mon, 1 Mar 2010 16:22:27 +0000 (16:22 +0000)]
amend release notes for 0.5.1

Originally committed as revision 22129 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoMention security fixes in the changelog.
Diego Biurrun [Sun, 28 Feb 2010 22:22:22 +0000 (22:22 +0000)]
Mention security fixes in the changelog.

Originally committed as revision 22121 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoadd myself to gpg fingerprint list
Reinhard Tartler [Sat, 27 Feb 2010 10:16:45 +0000 (10:16 +0000)]
add myself to gpg fingerprint list

backport r22089 by siretart

Originally committed as revision 22090 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agobump LIBAVCODEC_VERSION_MICRO for addition of the lock manager API
Reinhard Tartler [Sat, 27 Feb 2010 10:01:45 +0000 (10:01 +0000)]
bump LIBAVCODEC_VERSION_MICRO for addition of the lock manager API

As discussed with Diego, we'll go for bumping micro in 0.5 and will
consider adding a RELEASEVERSION macro for trunk and 0.6 seperatly

Originally committed as revision 22087 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoAvoid divisions by 0 in the ASF demuxer if packet_size is not valid.
Reinhard Tartler [Fri, 26 Feb 2010 15:49:52 +0000 (15:49 +0000)]
Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.

r19330 by reimar

Originally committed as revision 22080 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agofix the remaining ogv segfaults from issue 1240.
Reinhard Tartler [Fri, 26 Feb 2010 14:32:27 +0000 (14:32 +0000)]
fix the remaining ogv segfaults from issue 1240.

First commit:

Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
Otherwise this will crash during decoding because the vlc tables are NULL.
Partially fixes ogv/smclock.ogv.1.101.ogv from issue 1240.

backport r19355 by reimar

Second commit:

Add extra validation checks to ff_vorbis_len2vlc.
They should not be necessary, but it seems like a reasonable precaution.

r19374 by reimar

Originally committed as revision 22076 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoMake sure we dont read over the end.
Reinhard Tartler [Fri, 26 Feb 2010 10:56:46 +0000 (10:56 +0000)]
Make sure we dont read over the end.
Fixes issue1237.

backport r19322 by michael

Originally committed as revision 22074 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agobackport libx264.c from trunk
Reinhard Tartler [Wed, 24 Feb 2010 22:40:10 +0000 (22:40 +0000)]
backport libx264.c from trunk

now compiles with x264 API versions 65 up to 85

patch prepared by darkshikari

Originally committed as revision 22042 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agomisc. manpage updates, fixes LP: #501729, Debian: #570050
Reinhard Tartler [Tue, 16 Feb 2010 23:04:10 +0000 (23:04 +0000)]
misc. manpage updates, fixes LP: #501729, Debian: #570050

Update ffmpeg documentation regarding metadata setting. -title,
-author, -copyright, -track, -album, and -year options have been
dropped in favor of -metadata.
Add an explanation and complete the metadata usage example.

backported revisions r19285, r19287 and r19320 by stefano.

Originally committed as revision 21858 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agocosmetics: K&R coding style, prettyprinting
Reinhard Tartler [Mon, 15 Feb 2010 12:45:14 +0000 (12:45 +0000)]
cosmetics: K&R coding style, prettyprinting

backported r20083 by diego

This commit does not introduce functional changes.  It was applied in
order to faciliate reviewing the proposed libx264.c backport

Originally committed as revision 21832 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoFix crash in MLP decoder due to integer overflow.
Reinhard Tartler [Thu, 11 Feb 2010 21:03:30 +0000 (21:03 +0000)]
Fix crash in MLP decoder due to integer overflow.
Probably only DoS, init_get_bits sets buffer to NULL, thus causing a
NULL-dereference directly after.

backport r21426 by reimar

Originally committed as revision 21759 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoMake sure the block array is of the correct size.
Reinhard Tartler [Thu, 11 Feb 2010 20:57:49 +0000 (20:57 +0000)]
Make sure the block array is of the correct size.
This might have been exploitable.

backported r18393 by michael

Originally committed as revision 21758 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoFix crash when max_ref_frames was out of range.
Reinhard Tartler [Thu, 11 Feb 2010 16:22:59 +0000 (16:22 +0000)]
Fix crash when max_ref_frames was out of range.
This might have been exploitable.
Fixes first crash of issue840.

backport r18388 by michael

Originally committed as revision 21757 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoreverting objected hunks from previous commit
Reinhard Tartler [Thu, 11 Feb 2010 11:52:59 +0000 (11:52 +0000)]
reverting objected hunks from previous commit

as discussed with diego on irc, the spurious newline deletion and the
LIBAVCODEC_VERSION_MINOR bump are being reverted based on comments on
ffmpeg-cvslog by ramiro, uoti and michael.

See http://comments.gmane.org/gmane.comp.video.ffmpeg.cvs/28112 for the
full context.

Originally committed as revision 21755 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoAdd a lock manager API to libavcodec.
Reinhard Tartler [Tue, 9 Feb 2010 20:28:42 +0000 (20:28 +0000)]
Add a lock manager API to libavcodec.

Allows an application to register a callback that manages mutexes
on behalf of FFmpeg.
With this callback registered FFmpeg is fully thread safe.

backport r19025 by andoma

NB: This is a feature backport with little regression potential. It was
requested at FOSDEM 2010 by ben@geexbox.org for use by geexbox and the
enna mediacenter in the upcoming debian/squeeze and ubuntu/lucid
release.

Approved by DonDiego on #ffmpeg-devel

Originally committed as revision 21731 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck submap indexes.
Google Chrome [Tue, 9 Feb 2010 19:59:11 +0000 (19:59 +0000)]
Check submap indexes.
10_vorbis_submap_indexes.patch by chrome.
I am applying this even though Reimar had some comments to improve it as it fixes
a serious security issue and I do not want to leave such things unfixed.

backport r20001 by michael

Originally committed as revision 21730 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck begin/end/partition_size.
Google Chrome [Tue, 9 Feb 2010 19:54:42 +0000 (19:54 +0000)]
Check begin/end/partition_size.
23_vorbis_sane_partition.patch by chrome.
Also this should be better documented but i prefer not to leave potential
security issues open due to missing documentation.

r19996 by michael

Originally committed as revision 21729 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck res_setup->books.
Google Chrome [Tue, 9 Feb 2010 19:52:27 +0000 (19:52 +0000)]
Check  res_setup->books.
15_more_residue_book_indexes.patch by chrome.

r19992 by michael

Originally committed as revision 21728 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck masterbook index and subclass book index.
Google Chrome [Tue, 9 Feb 2010 19:50:47 +0000 (19:50 +0000)]
Check masterbook index and subclass book index.
14_floor_masterbook_index.patch by chrome

r19991 by michael

Originally committed as revision 21727 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoAdd checks for per-packet mode indexes and per-header mode mapping indexes.
Google Chrome [Tue, 9 Feb 2010 19:49:28 +0000 (19:49 +0000)]
Add checks for per-packet mode indexes and per-header mode mapping indexes.
12_vorbis_mode_indexes.patch by chrome
maybe exploitable

r19990 by michael

Originally committed as revision 21726 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck classbook value.
Google Chrome [Tue, 9 Feb 2010 19:47:42 +0000 (19:47 +0000)]
Check classbook value.
11_vorbis_residue_book_index.patch by chrome.

r19989 by michael

Originally committed as revision 21725 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoFix book_idx check.
Google Chrome [Tue, 9 Feb 2010 19:46:22 +0000 (19:46 +0000)]
Fix book_idx check.
25_vorbis_floor0_index.patch by chrome.

backport r19984 by michael

Originally committed as revision 21724 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoSanity checks for magnitude and angle.
Google Chrome [Tue, 9 Feb 2010 19:45:16 +0000 (19:45 +0000)]
Sanity checks for magnitude and angle.
26_vorbis_mag_angle_index.patch by chrome

backport r19983 by michael

Originally committed as revision 21723 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years ago= -> == typo.
Google Chrome [Tue, 9 Feb 2010 19:44:06 +0000 (19:44 +0000)]
= -> == typo.
27_vorbis_residue_loop_error.patch by chrome

backport r19982 by michael

Originally committed as revision 21722 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck dimensions against 0 too.
Reinhard Tartler [Tue, 9 Feb 2010 19:42:30 +0000 (19:42 +0000)]
Check dimensions against 0 too.
39_vorbis_zero_dims.patch from chrome

backport r19976 by michael

Originally committed as revision 21721 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoMake sure that all memory allocations succeed.
Reinhard Tartler [Tue, 9 Feb 2010 19:31:04 +0000 (19:31 +0000)]
Make sure that all memory allocations succeed.
Based on 28_theora_malloc_checks.patch from the Google Chrome team.

backport r20008 by melanson

Originally committed as revision 21720 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoFix init_get_bits() buffer size.
Google Chrome [Tue, 9 Feb 2010 19:26:47 +0000 (19:26 +0000)]
Fix init_get_bits() buffer size.
18_fix_theora_header_bit_len.patch by chrome

backport r19993 by michael

Originally committed as revision 21719 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoSet data_size to 0 to avoid having it uninitialized.
Reinhard Tartler [Tue, 9 Feb 2010 19:22:19 +0000 (19:22 +0000)]
Set data_size to 0 to avoid having it uninitialized.
based on 31_mp3_outlen.patch by chrome.

backported r19988 by michael

Originally committed as revision 21718 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck data_size in decode_frame_mp3on4().
Reinhard Tartler [Tue, 9 Feb 2010 19:20:25 +0000 (19:20 +0000)]
Check data_size in decode_frame_mp3on4().

backported r19987 by michael

Originally committed as revision 21717 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agocheck data_size in decode_frame()
Reinhard Tartler [Tue, 9 Feb 2010 19:09:12 +0000 (19:09 +0000)]
check data_size in decode_frame()

backported r19986 by michael

Originally committed as revision 21716 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoCheck num_units_in_tick/time_scale to be valid and within the range we support.
Reinhard Tartler [Tue, 9 Feb 2010 19:02:39 +0000 (19:02 +0000)]
Check num_units_in_tick/time_scale to be valid and within the range we support.
based on a patch by chrome

backported r19979 by michael

Originally committed as revision 21715 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoFix a possibly exploitable buffer overflow.
Reinhard Tartler [Tue, 9 Feb 2010 18:55:41 +0000 (18:55 +0000)]
Fix a possibly exploitable buffer overflow.

backported r18640 by michael

Originally committed as revision 21712 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoFix possible buffer over-read in vorbis_comment, fix it double to be sure.
Reinhard Tartler [Tue, 9 Feb 2010 18:51:11 +0000 (18:51 +0000)]
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

9 years agocheck stream existence before assignment, fix #1222
Reinhard Tartler [Tue, 9 Feb 2010 18:44:49 +0000 (18:44 +0000)]
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

9 years agoadd one missing check for stream existence in read_elst, fix #1364
Reinhard Tartler [Tue, 9 Feb 2010 18:41:17 +0000 (18:41 +0000)]
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

9 years agoDisable parsing for ogg streams where no ogg header was found,
Reinhard Tartler [Tue, 9 Feb 2010 18:24:30 +0000 (18:24 +0000)]
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

9 years agoMake arguments of av_set_pts_info() unsigned.
Reinhard Tartler [Tue, 9 Feb 2010 18:10:07 +0000 (18:10 +0000)]
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

9 years agofix aac playback regression
Reinhard Tartler [Tue, 9 Feb 2010 17:36:18 +0000 (17:36 +0000)]
fix aac playback regression

Discussed at http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/103768

related reports:
 - http://bugs.debian.org/540729
 - https://roundup.ffmpeg.org/roundup/ffmpeg/issue800

Originally committed as revision 21706 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agobuild PIC code on powerpc
Reinhard Tartler [Tue, 2 Feb 2010 20:48:21 +0000 (20:48 +0000)]
build PIC code on powerpc

this avoids failing 24bit relocations as seen on
http://bugs.debian.org/561956 as side effect

Originally committed as revision 21613 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoAdd gnu/kfreebsd to list of recognized operating systems.
Andres Mejia [Tue, 2 Feb 2010 20:44:47 +0000 (20:44 +0000)]
Add gnu/kfreebsd to list of recognized operating systems.
patch by Andres Mejia, mcitadel gmail com

Originally committed as revision 21612 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agobackport configure bits for cpu runtime detection for libpostproc and libswscale
Reinhard Tartler [Tue, 2 Feb 2010 20:30:20 +0000 (20:30 +0000)]
backport configure bits for cpu runtime detection for libpostproc and libswscale

Originally committed as revision 21611 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agofix version script for libswscale
Reinhard Tartler [Tue, 2 Feb 2010 20:16:46 +0000 (20:16 +0000)]
fix version script for libswscale

Originally committed as revision 21610 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agounbreak compilation with vhook enabled
Reinhard Tartler [Tue, 2 Feb 2010 19:58:05 +0000 (19:58 +0000)]
unbreak compilation with vhook enabled

the backported introduced a regression that prevents successfully
linking vhook shared objects on systems with gnu linkers. As the version
scripts only apply to shared objects against that applications are being
linked, this commit unties the VHOOKSHFLAGS and SHFLAGS variable.

Originally committed as revision 21609 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agomissing hunk to unbreak linking with symbol versioning
Reinhard Tartler [Tue, 2 Feb 2010 19:57:40 +0000 (19:57 +0000)]
missing hunk to unbreak linking with symbol versioning

this hunk is does not apply in trunk/ because there the dependencies for
this rule was reworked

Originally committed as revision 21608 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agomention symbol versioning
Reinhard Tartler [Mon, 1 Feb 2010 16:02:46 +0000 (16:02 +0000)]
mention symbol versioning

Originally committed as revision 21596 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agobackport symbol versioning patch
Reinhard Tartler [Mon, 1 Feb 2010 16:00:09 +0000 (16:00 +0000)]
backport symbol versioning patch

Originally committed as revision 21595 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

9 years agoThe license upgrade code was ported from trunk.
Diego Biurrun [Tue, 15 Dec 2009 22:34:22 +0000 (22:34 +0000)]
The license upgrade code was ported from trunk.

Originally committed as revision 20876 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge remaining changes to make libswscale usable in LGPL mode from trunk.
Diego Biurrun [Sun, 5 Jul 2009 20:35:02 +0000 (20:35 +0000)]
Merge remaining changes to make libswscale usable in LGPL mode from trunk.

Originally committed as revision 19352 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoRevert r19321.
Stefano Sabatini [Fri, 3 Jul 2009 11:14:37 +0000 (11:14 +0000)]
Revert r19321.
The changes were not approved.

Originally committed as revision 19329 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoUpdate ffmpeg documentation regarding metadata setting. -title,
Stefano Sabatini [Wed, 1 Jul 2009 20:14:19 +0000 (20:14 +0000)]
Update ffmpeg documentation regarding metadata setting. -title,
-author, -copyright, -track, -album, and -year options have been
dropped in favor of -metadata.

Backfix of r19285, r19287, and r19320.

Originally committed as revision 19321 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoFix OpenCORE build: Do not use new AVPacket infrastructure from trunk.
Diego Biurrun [Sun, 7 Jun 2009 22:41:11 +0000 (22:41 +0000)]
Fix OpenCORE build: Do not use new AVPacket infrastructure from trunk.

Originally committed as revision 19134 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge OpenCORE AMR support from trunk.
Diego Biurrun [Sun, 7 Jun 2009 20:14:56 +0000 (20:14 +0000)]
Merge OpenCORE AMR support from trunk.

Originally committed as revision 19133 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge recent libamr changes from trunk, as preparation for OpenCORE support.
Diego Biurrun [Sun, 7 Jun 2009 16:14:50 +0000 (16:14 +0000)]
Merge recent libamr changes from trunk, as preparation for OpenCORE support.

Originally committed as revision 19131 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge (L)GPL upgrade code and related changes from trunk.
Diego Biurrun [Sun, 7 Jun 2009 12:52:31 +0000 (12:52 +0000)]
Merge (L)GPL upgrade code and related changes from trunk.

Originally committed as revision 19129 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoIgnore generated files.
Diego Biurrun [Mon, 25 May 2009 09:17:17 +0000 (09:17 +0000)]
Ignore generated files.

Originally committed as revision 18939 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge more verbose licensing information output.
Diego Biurrun [Sun, 24 May 2009 22:14:10 +0000 (22:14 +0000)]
Merge more verbose licensing information output.

Originally committed as revision 18931 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge GPL --> LGPL conversion of AC-3 decoder from trunk.
Diego Biurrun [Sat, 23 May 2009 12:58:44 +0000 (12:58 +0000)]
Merge GPL --> LGPL conversion of AC-3 decoder from trunk.

Originally committed as revision 18915 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMention post 0.5 commits in the changelog.
Diego Biurrun [Sat, 23 May 2009 12:18:53 +0000 (12:18 +0000)]
Mention post 0.5 commits in the changelog.

Originally committed as revision 18914 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge explanation of changelog sort order from trunk.
Diego Biurrun [Sat, 23 May 2009 12:04:11 +0000 (12:04 +0000)]
Merge explanation of changelog sort order from trunk.

Originally committed as revision 18913 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge fix for license check function from trunk.
Diego Biurrun [Sun, 10 May 2009 11:02:03 +0000 (11:02 +0000)]
Merge fix for license check function from trunk.

Originally committed as revision 18782 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoRevert unapproved changes.
Ramiro Polla [Thu, 7 May 2009 22:46:42 +0000 (22:46 +0000)]
Revert unapproved changes.

Originally committed as revision 18770 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoBackport r17995 from trunk.
Ramiro Polla [Wed, 6 May 2009 15:31:02 +0000 (15:31 +0000)]
Backport r17995 from trunk.

Originally committed as revision 18760 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoBackport r18214 from trunk.
Ramiro Polla [Wed, 6 May 2009 15:29:59 +0000 (15:29 +0000)]
Backport r18214 from trunk.

Originally committed as revision 18759 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge marking of libfaac as non-free from trunk.
Diego Biurrun [Wed, 6 May 2009 12:12:05 +0000 (12:12 +0000)]
Merge marking of libfaac as non-free from trunk.

Originally committed as revision 18757 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge factorization of license check code from trunk.
Diego Biurrun [Wed, 6 May 2009 12:10:27 +0000 (12:10 +0000)]
Merge factorization of license check code from trunk.

Originally committed as revision 18756 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge automatic addition of -fno-common to CFLAGS for Windows from trunk.
Diego Biurrun [Sun, 19 Apr 2009 13:22:08 +0000 (13:22 +0000)]
Merge automatic addition of -fno-common to CFLAGS for Windows from trunk.

Originally committed as revision 18619 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge replacement of MPEG group reference DCT code.
Diego Biurrun [Mon, 13 Apr 2009 10:23:10 +0000 (10:23 +0000)]
Merge replacement of MPEG group reference DCT code.

Originally committed as revision 18492 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge LGPL relicensing of AltiVec optimizations.
Diego Biurrun [Mon, 13 Apr 2009 10:15:48 +0000 (10:15 +0000)]
Merge LGPL relicensing of AltiVec optimizations.

Originally committed as revision 18491 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge fix for GPL code that erroneously made it into the LGPL build.
Diego Biurrun [Mon, 13 Apr 2009 10:15:04 +0000 (10:15 +0000)]
Merge fix for GPL code that erroneously made it into the LGPL build.

Originally committed as revision 18490 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge split of README <-> LICENSE files along with the clarifications.
Diego Biurrun [Mon, 13 Apr 2009 10:11:31 +0000 (10:11 +0000)]
Merge split of README <-> LICENSE files along with the clarifications.

Originally committed as revision 18489 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoAdd a copy of libswscale into the branch instead of using svn:external.
Diego Biurrun [Mon, 13 Apr 2009 10:00:56 +0000 (10:00 +0000)]
Add a copy of libswscale into the branch instead of using svn:external.
This will allow merging some changes from trunk.

Originally committed as revision 18488 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMerge improved version number generation from trunk.
Diego Biurrun [Tue, 31 Mar 2009 21:11:04 +0000 (21:11 +0000)]
Merge improved version number generation from trunk.

Originally committed as revision 18288 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoRevert hackish release version number hardcoding in version.sh.
Diego Biurrun [Tue, 31 Mar 2009 21:06:20 +0000 (21:06 +0000)]
Revert hackish release version number hardcoding in version.sh.

Originally committed as revision 18287 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoPeg libswscale to the revision corresponding to the moment the branch was cut. v0.5
Diego Biurrun [Sun, 8 Mar 2009 22:13:48 +0000 (22:13 +0000)]
Peg libswscale to the revision corresponding to the moment the branch was cut.

Originally committed as revision 17887 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoCorrect grammar in one sentence and add a note about doc/APIchanges
Robert Swain [Wed, 4 Mar 2009 16:52:37 +0000 (16:52 +0000)]
Correct grammar in one sentence and add a note about doc/APIchanges

Originally committed as revision 17805 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoAdd some release notes for this 0.5 release branch
Robert Swain [Tue, 3 Mar 2009 23:04:47 +0000 (23:04 +0000)]
Add some release notes for this 0.5 release branch

Originally committed as revision 17787 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoOutput 0.5 as version string.
Diego Biurrun [Tue, 3 Mar 2009 12:47:47 +0000 (12:47 +0000)]
Output 0.5 as version string.

Originally committed as revision 17754 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agorevert r16717, r16718, r16719, EAGAIN handling, this causes FFserver to hang
Baptiste Coudurier [Mon, 2 Mar 2009 20:32:24 +0000 (20:32 +0000)]
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

10 years agoCreate 0.5 release branch.
Diego Biurrun [Mon, 2 Mar 2009 08:32:29 +0000 (08:32 +0000)]
Create 0.5 release branch.

Originally committed as revision 17727 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

10 years agoMention non-recursive Makefiles in the changelog.
Diego Biurrun [Mon, 2 Mar 2009 07:57:04 +0000 (07:57 +0000)]
Mention non-recursive Makefiles in the changelog.

Originally committed as revision 17725 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agocosmetics: spelling/wording fixes
Diego Biurrun [Mon, 2 Mar 2009 07:52:47 +0000 (07:52 +0000)]
cosmetics: spelling/wording fixes

Originally committed as revision 17724 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAC-3 encoding is integer-only
Justin Ruggles [Mon, 2 Mar 2009 06:31:28 +0000 (06:31 +0000)]
AC-3 encoding is integer-only

Originally committed as revision 17723 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoRevert previous removal of PAM, PBM, PGM, PGMYUV and PPM from the list of
Diego Biurrun [Mon, 2 Mar 2009 06:13:54 +0000 (06:13 +0000)]
Revert previous removal of PAM, PBM, PGM, PGMYUV and PPM from the list of
supported image formats. Apparently decoding these formats is supported.

Originally committed as revision 17722 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agocosmetics: Reformat long_names so that "DPCM" comes first.
Diego Biurrun [Mon, 2 Mar 2009 06:01:32 +0000 (06:01 +0000)]
cosmetics: Reformat long_names so that "DPCM" comes first.

Originally committed as revision 17721 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agocosmetics: Reformat long_names so that "ADPCM" comes first.
Diego Biurrun [Mon, 2 Mar 2009 05:55:03 +0000 (05:55 +0000)]
cosmetics: Reformat long_names so that "ADPCM" comes first.

Originally committed as revision 17720 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agocosmetics: Reformat long_names so that "PCM" comes first.
Diego Biurrun [Mon, 2 Mar 2009 05:45:44 +0000 (05:45 +0000)]
cosmetics: Reformat long_names so that "PCM" comes first.

Originally committed as revision 17719 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agosmall spelling/grammar fixes
Diego Biurrun [Mon, 2 Mar 2009 05:41:55 +0000 (05:41 +0000)]
small spelling/grammar fixes

Originally committed as revision 17718 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoxvmc works with MPEG-2 as well as MPEG-1, note this in the codec long_name.
Diego Biurrun [Mon, 2 Mar 2009 05:20:00 +0000 (05:20 +0000)]
xvmc works with MPEG-2 as well as MPEG-1, note this in the codec long_name.

Originally committed as revision 17717 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoChange a bunch of codec long_names to be more consistent and descriptive.
Diego Biurrun [Mon, 2 Mar 2009 05:18:33 +0000 (05:18 +0000)]
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

10 years agoDecoding of PAM, PBM, PGM, PGMYUV and PPM image formats is not supported.
Diego Biurrun [Mon, 2 Mar 2009 05:08:57 +0000 (05:08 +0000)]
Decoding of PAM, PBM, PGM, PGMYUV and PPM image formats is not supported.

Originally committed as revision 17715 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agofigure out which muxers support which codecs? new api required!
Ben Littler [Mon, 2 Mar 2009 04:37:46 +0000 (04:37 +0000)]
figure out which muxers support which codecs? new api required!

Originally committed as revision 17714 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoThe Ogg muxer will handle Theora as well
Robert Swain [Mon, 2 Mar 2009 04:19:59 +0000 (04:19 +0000)]
The Ogg muxer will handle Theora as well

Originally committed as revision 17713 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAnother round of missing codecs and name updates to match the codec long_name.
Diego Biurrun [Mon, 2 Mar 2009 03:52:40 +0000 (03:52 +0000)]
Another round of missing codecs and name updates to match the codec long_name.

Originally committed as revision 17712 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd some more missing codecs and update names to match the codec long_name.
Justin Ruggles [Mon, 2 Mar 2009 03:41:58 +0000 (03:41 +0000)]
Add some more missing codecs and update names to match the codec long_name.

Originally committed as revision 17711 to svn://svn.ffmpeg.org/ffmpeg/trunk

10 years agoAdd some more missing codecs and update names to match the codec long_name.
Diego Biurrun [Mon, 2 Mar 2009 03:30:53 +0000 (03:30 +0000)]
Add some more missing codecs and update names to match the codec long_name.

Originally committed as revision 17710 to svn://svn.ffmpeg.org/ffmpeg/trunk