Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0fecf2642b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'newdev/master'  
						
						... 
						
						
						
						Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2011-03-17 17:22:52 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							66e5b1df36 
							
						 
					 
					
						
						
							
							avio: deprecate url_feof  
						
						... 
						
						
						
						AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> 
						
						
					 
					
						2011-03-07 17:20:31 -05:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							384c9c2fa7 
							
						 
					 
					
						
						
							
							avio: add avio_tell macro as a replacement for url_ftell  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712ad35cc22e7e0d8a79b581c07fa383b) 
						
						
					 
					
						2011-03-05 02:29:31 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							74b3f67c9c 
							
						 
					 
					
						
						
							
							lavf: replace all uses of url_fskip with avio_seek  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2e9887370caec58d8aafeafd1f336dc) 
						
						
					 
					
						2011-03-03 14:15:08 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							e63a362857 
							
						 
					 
					
						
						
							
							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>
(cherry picked from commit b7effd4e8338f6ed5bda630ad7ed0809bf458648) 
						
						
					 
					
						2011-02-22 02:44:37 +01: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 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							471fe57e1a 
							
						 
					 
					
						
						
							
							avio: rename ByteIOContext to AVIOContext.  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd7f54c102bf9e667a3edd404b9b9128) 
						
						
					 
					
						2011-02-20 19:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							ae628ec1fd 
							
						 
					 
					
						
						
							
							avio: rename ByteIOContext to AVIOContext.  
						
						... 
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> 
						
						
					 
					
						2011-02-20 08:37:15 -05:00 
						 
				 
			
				
					
						
							
							
								Diego Elio Pettenò 
							
						 
					 
					
						
						
						
						
							
						
						
							66355be3c3 
							
						 
					 
					
						
						
							
							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.
(cherry picked from commit c6610a216ed2948885772154a2eed696e0cb4aca) 
						
						
					 
					
						2011-01-28 03:15:34 +01: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Daniel Verkamp 
							
						 
					 
					
						
						
						
						
							
						
						
							1a40491ef2 
							
						 
					 
					
						
						
							
							Add ff_ prefixes to exported symbols in libavformat/riff.h.  
						
						... 
						
						
						
						patch by Daniel Verkamp, aniel drv nu
Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-06-22 23:09:34 +00:00 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
						
						
							
						
						
							36a12218db 
							
						 
					 
					
						
						
							
							swf timestamps are 16 bits  
						
						... 
						
						
						
						Originally committed as revision 17969 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-03-14 22:51:38 +00:00 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
						
						
							
						
						
							40a1d41fd2 
							
						 
					 
					
						
						
							
							remove unused fields in swf context  
						
						... 
						
						
						
						Originally committed as revision 17968 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-03-14 22:49:01 +00:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
						
						
							
						
						
							7e04cfba27 
							
						 
					 
					
						
						
							
							Set pkt->pos correctly (to the start of header of the packet) in swfdec.  
						
						... 
						
						
						
						Originally committed as revision 17953 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-03-13 22:26:45 +00:00 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
						
						
							
						
						
							4e35ffa978 
							
						 
					 
					
						
						
							
							fix swf seeking by fixing new stream detection  
						
						... 
						
						
						
						Originally committed as revision 17952 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-03-13 19:37:05 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							406792e7b0 
							
						 
					 
					
						
						
							
							cosmetics: Remove pointless period after copyright statement non-sentences.  
						
						... 
						
						
						
						Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-01-19 15:46:40 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
						
						
							
						
						
							6a5d31ac25 
							
						 
					 
					
						
						
							
							Fix build: Add intreadwrite.h and bswap.h #includes where necessary.  
						
						... 
						
						
						
						Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-01-11 22:19:48 +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 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
						
						
							
						
						
							376aefddad 
							
						 
					 
					
						
						
							
							cosmetics, add demuxer word  
						
						... 
						
						
						
						Originally committed as revision 13422 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-26 03:57:07 +00:00 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
						
						
							
						
						
							3e67f255a4 
							
						 
					 
					
						
						
							
							remove useless/obsolete comments  
						
						... 
						
						
						
						Originally committed as revision 13205 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-20 23:39:07 +00:00 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
						
						
							
						
						
							ad0b44b31a 
							
						 
					 
					
						
						
							
							remove useless close function  
						
						... 
						
						
						
						Originally committed as revision 13204 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-20 23:32:22 +00:00 
						 
				 
			
				
					
						
							
							
								Baptiste Coudurier 
							
						 
					 
					
						
						
						
						
							
						
						
							3b35f4ab51 
							
						 
					 
					
						
						
							
							split swf de/muxer  
						
						... 
						
						
						
						Originally committed as revision 13203 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-20 23:31:10 +00:00