| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Alexander Strange | 37b00b47cb | Frame-based multithreading framework using pthreads See doc/multithreading.txt for details on use in codecs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-09 09:17:28 -05:00 |  |