Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f9ecb849ef 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  crypto: Use av_freep instead of av_free
  lavf: don't try to free private options if priv_data is NULL.
  swscale: fix types of assembly arguments.
  swscale: move two macros that are only used once into caller.
  swscale: remove unused function.
  options: Add missing braces around struct initializer.
  mov: Remove leftover crufty debug statement with references to a local file.
  dvbsubdec: Fix compilation of debug code.
  Remove all uses of now deprecated metadata functions.
  Move metadata API from lavf to lavu.
Conflicts:
	doc/APIchanges
	libavformat/aiffdec.c
	libavformat/asfdec.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/cafdec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/mp3enc.c
	libavformat/wtv.c
	libavutil/avutil.h
	libavutil/internal.h
	libswscale/swscale.c
	libswscale/x86/swscale_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-06-09 04:47:19 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						d2d67e424f 
					 
					
						
						
							
							Remove all uses of now deprecated metadata functions.  
						
						
						
						
					 
					
						2011-06-08 07:43:45 +02:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
							
						
						2912e87a6c 
					 
					
						
						
							
							Replace FFmpeg with Libav in licence headers  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com > 
						
						
					 
					
						2011-03-19 13:33:20 +00:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						45a8a02a41 
					 
					
						
						
							
							lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com > 
						
						
					 
					
						2011-03-16 22:24:51 -04:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						a2704c9712 
					 
					
						
						
							
							avio: add avio_tell macro as a replacement for url_ftell  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com > 
						
						
					 
					
						2011-03-04 11:26:57 -05:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						e356fc57a2 
					 
					
						
						
							
							lavf: replace all uses of url_fskip with avio_seek  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com > 
						
						
					 
					
						2011-03-01 12:22:16 -05:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						6b4aa5dac8 
					 
					
						
						
							
							avio: avio_ prefix for url_fseek  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com > 
						
						
					 
					
						2011-03-01 12:12:33 -05:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						b7effd4e83 
					 
					
						
						
							
							avio: avio_ prefixes for get_* functions  
						
						... 
						
						
						
						In the name of consistency:
get_byte           -> avio_r8
get_<type>         -> avio_r<type>
get_buffer         -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com > 
						
						
					 
					
						2011-02-21 11:23:22 -05:00 
						 
				 
			
				
					
						
							
							
								Diego Elio Pettenò 
							
						 
					 
					
						
						
							
						
						c6610a216e 
					 
					
						
						
							
							Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.  
						
						... 
						
						
						
						This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts. 
						
						
					 
					
						2011-01-26 22:10:09 +00:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
							
						
						6612d8cf31 
					 
					
						
						
							
							Move handling of ID3v2 to common utils.c code, reducing code duplication  
						
						... 
						
						
						
						and supporting it for more formats, fixing issue 2258.
Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-10-06 20:21:07 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Karcher 
							
						 
					 
					
						
						
							
						
						3a1350e8d9 
					 
					
						
						
							
							Generalize ID3v2 functions to support ID3v2-like ID headers with a  
						
						... 
						
						
						
						different magic in the header (mainly targeted to Sony's .oma/.aa3
format).
Patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de
Originally committed as revision 23583 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-06-11 13:44:57 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						72415b2adb 
					 
					
						
						
							
							Define AVMediaType enum, and use it instead of enum CodecType, which  
						
						... 
						
						
						
						is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-03-30 23:30:55 +00:00 
						 
				 
			
				
					
						
							
							
								Jai Menon 
							
						 
					 
					
						
						
							
						
						8993535cbb 
					 
					
						
						
							
							10l : make sure probe buffer is large enough.  
						
						... 
						
						
						
						Originally committed as revision 20889 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-12-17 13:05:37 +00:00 
						 
				 
			
				
					
						
							
							
								Jai Menon 
							
						 
					 
					
						
						
							
						
						22ff336145 
					 
					
						
						
							
							Parse ID3v[12] metadata from TTA files.  
						
						... 
						
						
						
						As a side-effect, this commit also fixes issue 1310.
Originally committed as revision 20886 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-12-16 19:18:48 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						9106a698e7 
					 
					
						
						
							
							Rename bitstream.h to get_bits.h.  
						
						... 
						
						
						
						Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-04-13 16:20:26 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
							
						
						2bb6eba21d 
					 
					
						
						
							
							remove ff_get_fourcc() and use AV_RL32() instead  
						
						... 
						
						
						
						Originally committed as revision 16654 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-01-17 12:21:01 +00:00 
						 
				 
			
				
					
						
							
							
								Luca Abeni 
							
						 
					 
					
						
						
							
						
						dd1c8f3e6e 
					 
					
						
						
							
							Bump Major version, this commit is almost just renaming bits_per_sample to  
						
						... 
						
						
						
						bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-09-08 14:24:59 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						bde15e74de 
					 
					
						
						
							
							Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.  
						
						... 
						
						
						
						patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me
Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-06-03 16:20:54 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						245976da2a 
					 
					
						
						
							
							Use full path for #includes from another directory.  
						
						... 
						
						
						
						Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-09 11:56:36 +00:00 
						 
				 
			
				
					
						
							
							
								Björn Axelsson 
							
						 
					 
					
						
						
							
						
						899681cd1d 
					 
					
						
						
							
							Use dynamically allocated ByteIOContext in AVFormatContext  
						
						... 
						
						
						
						patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007
Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-11-21 07:41:00 +00:00 
						 
				 
			
				
					
						
							
							
								David Conrad 
							
						 
					 
					
						
						
							
						
						160ab30fcc 
					 
					
						
						
							
							Set dts in tta demuxer  
						
						... 
						
						
						
						Originally committed as revision 10077 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-08-11 22:45:40 +00:00 
						 
				 
			
				
					
						
							
							
								Panagiotis Issaris 
							
						 
					 
					
						
						
							
						
						769e10f068 
					 
					
						
						
							
							Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).  
						
						... 
						
						
						
						Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-07-19 15:21:30 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						e5a389a1b7 
					 
					
						
						
							
							license header consistency cosmetics  
						
						... 
						
						
						
						Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-07-05 10:40:25 +00:00 
						 
				 
			
				
					
						
							
							
								David Conrad 
							
						 
					 
					
						
						
							
						
						70fa2486a1 
					 
					
						
						
							
							Support for seeking in TTA files.  
						
						... 
						
						
						
						Originally committed as revision 8820 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-04-25 23:22:05 +00:00 
						 
				 
			
				
					
						
							
							
								David Conrad 
							
						 
					 
					
						
						
							
						
						756fb7fea1 
					 
					
						
						
							
							Change from using a seek table internal to the TTA demuxer to using the standard lavf index.  
						
						... 
						
						
						
						Originally committed as revision 8780 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-04-22 00:50:36 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						87e8788680 
					 
					
						
						
							
							allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks  
						
						... 
						
						
						
						Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-04-08 11:34:15 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						30a1380a04 
					 
					
						
						
							
							cosmetics: Fix indentation.  
						
						... 
						
						
						
						Originally committed as revision 8565 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-03-31 11:48:28 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						09a628662d 
					 
					
						
						
							
							argh, who commited this trash  
						
						... 
						
						
						
						start must be 0 ...
Originally committed as revision 8563 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-03-30 22:10:25 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						dc417a6e2f 
					 
					
						
						
							
							10^10l to the idiot who designed this format and didnt even realize what number he used  
						
						... 
						
						
						
						Originally committed as revision 8562 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-03-30 21:59:52 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						b78e7197a8 
					 
					
						
						
							
							Change license headers to say 'FFmpeg' instead of 'this program/this library'  
						
						... 
						
						
						
						and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-10-07 15:30:46 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
							
						
						51ebd13654 
					 
					
						
						
							
							ALT_BITSTREAM_READER_LE is obviously not needed for the tta demuxer, as there was a typo in the define  
						
						... 
						
						
						
						Originally committed as revision 6119 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-08-28 18:53:10 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						538389c981 
					 
					
						
						
							
							Fix FSF postal address.  
						
						... 
						
						
						
						Originally committed as revision 5829 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-07-26 01:12:26 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						ff70e60176 
					 
					
						
						
							
							allow individual selection of muxers and demuxers  
						
						... 
						
						
						
						Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-07-10 21:14:37 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						d2a067d1d9 
					 
					
						
						
							
							give AVInput/OutputFormat structs consistent names  
						
						... 
						
						
						
						Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-07-09 23:40:53 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a443a2530d 
					 
					
						
						
							
							sanity checks some might have been exploitable  
						
						... 
						
						
						
						Originally committed as revision 5370 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-05-13 11:37:56 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Beregszaszi 
							
						 
					 
					
						
						
							
						
						aa11db2f23 
					 
					
						
						
							
							10l, allocate bitbuffer with regard to the padding size  
						
						... 
						
						
						
						Originally committed as revision 5014 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-02-13 12:05:06 +00:00 
						 
				 
			
				
					
						
							
							
								Alex Beregszaszi 
							
						 
					 
					
						
						
							
						
						aafaeabb47 
					 
					
						
						
							
							tta demuxer, also usable for moving tta audio data into an other container  
						
						... 
						
						
						
						Originally committed as revision 4997 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-02-12 02:18:37 +00:00