Compn
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a0d4d4cd0
							
						
					 | 
					
						
						
							
							fix typo
						
						
						
						
						
						
					 | 
					
						2011-03-23 13:53:24 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6be21d3ba
							
						
					 | 
					
						
						
							
							Revert "replace FFmpeg with Libav in doc/"
						
						
						
						
						
						
						
						This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4.
Conflicts:
	doc/optimization.txt 
						
						
					 | 
					
						2011-03-17 17:26:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Janne Grunau
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8a45fa1b1
							
						
					 | 
					
						
						
							
							replace FFmpeg with Libav in doc/
						
						
						
						
						
						
						
						unless it stands for ffmpeg the program or is historic 
						
						
					 | 
					
						2011-03-16 22:01:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Johan Andersson
							
						 
					 | 
					
						
						
						
						
							
						
						
							21de920472
							
						
					 | 
					
						
						
							
							Update the url to the site website and change ffmpeg-devel to libav-devel
						
						
						
						
						
						
						
						Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> 
						
						
					 | 
					
						2011-03-13 18:45:29 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael Niedermayer
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe67841355
							
						
					 | 
					
						
						
							
							Revert "Update git-howto with ffmpeg.org URLs"
						
						
						
						
						
						
						
						This reverts commit 69c92320d760d3925d5c83c4fbca6012deef4195.
Reason is that this has been commited by mistake as discussed. 
						
						
					 | 
					
						2011-01-19 19:06:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mans Rullgard
							
						 
					 | 
					
						
						
						
						
							
						
						
							69c92320d7
							
						
					 | 
					
						
						
							
							Update git-howto with ffmpeg.org URLs
						
						
						
						
						
						
					 | 
					
						2011-01-18 20:48:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Reimar Döffinger
							
						 
					 | 
					
						
						
						
						
							
						
						
							4aaeabcb6a
							
						
					 | 
					
						
						
							
							Explain how to set up user name/email correctly for git.
						
						
						
						
						
						
					 | 
					
						2011-01-17 21:16:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Janne Grunau
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1c68a438c
							
						
					 | 
					
						
						
							
							Add instructions how to check out a specific svn revision with git
						
						
						
						
						
						
						
						Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> 
						
						
					 | 
					
						2011-01-17 11:33:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Janne Grunau
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffe9fd253f
							
						
					 | 
					
						
						
							
							rewrite git-howto for the no merge policy
						
						
						
						
						
						
						
						Originally committed as revision 26400 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 | 
					
						2011-01-17 10:02:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alex Converse
							
						 
					 | 
					
						
						
						
						
							
						
						
							5fbf2b3f66
							
						
					 | 
					
						
						
							
							Fix two typos in git howto.
						
						
						
						
						
						
						
						Originally committed as revision 26396 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 | 
					
						2011-01-16 20:16:01 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Janne Grunau
							
						 
					 | 
					
						
						
						
						
							
						
						
							adb8669c04
							
						
					 | 
					
						
						
							
							fix typo in git howto section heading
						
						
						
						
						
						
						
						spotted by ubitux on irc
Originally committed as revision 26393 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 | 
					
						2011-01-16 18:29:08 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Janne Grunau
							
						 
					 | 
					
						
						
						
						
							
						
						
							30876e3917
							
						
					 | 
					
						
						
							
							Add section how to find a svn changeset with git commands
						
						
						
						
						
						
						
						Originally committed as revision 26391 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 | 
					
						2011-01-16 18:20:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anton Khirnov
							
						 
					 | 
					
						
						
						
						
							
						
						
							df17f6d507
							
						
					 | 
					
						
						
							
							Add git-howto.
						
						
						
						
						
						
						
						mostly written by Luca.
Originally committed as revision 26389 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 | 
					
						2011-01-16 17:16:48 +00:00 | 
					
					
						
						
							
							
							
						
					 |