Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						6cb2085278 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...
Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-02-16 01:34:37 +01:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
							
						
						e96b4a53df 
					 
					
						
						
							
							vlc/rl: Add ff_ prefix to the nonstatic symbols  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st > 
						
						
					 
					
						2012-02-15 22:06:26 +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 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						ba87f0801d 
					 
					
						
						
							
							Remove explicit filename from Doxygen @file commands.  
						
						... 
						
						
						
						Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-04-20 14:45:34 +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 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						bad5537e2c 
					 
					
						
						
							
							Use full internal pathname in doxygen @file directives.  
						
						... 
						
						
						
						Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2009-02-01 02:00:19 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						987903826b 
					 
					
						
						
							
							Globally rename the header inclusion guard names.  
						
						... 
						
						
						
						Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-08-31 07:39:47 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ceaaf78bb7 
					 
					
						
						
							
							Change init_vlc_rl() so it does not use *alloc_static() anymore.  
						
						... 
						
						
						
						Originally committed as revision 13567 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-05-30 21:08:41 +00:00 
						 
				 
			
				
					
						
							
							
								Aurelien Jacobs 
							
						 
					 
					
						
						
							
						
						6d93461504 
					 
					
						
						
							
							move run length table constants to rl.h  
						
						... 
						
						
						
						Originally committed as revision 12319 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2008-03-04 23:58:12 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						5b21bdabe4 
					 
					
						
						
							
							Add FFMPEG_ prefix to all multiple inclusion guards.  
						
						... 
						
						
						
						Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-10-17 09:37:46 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						ef4d08ac6d 
					 
					
						
						
							
							Add standard licensing header to files that lack it.  
						
						... 
						
						
						
						Originally committed as revision 9573 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-07-10 10:02:01 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						f082badc21 
					 
					
						
						
							
							cosmetics: typo  
						
						... 
						
						
						
						Originally committed as revision 9572 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-07-10 09:58:38 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						99545457bf 
					 
					
						
						
							
							include all prerequisites in header files  
						
						... 
						
						
						
						Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-16 22:59:13 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						3502a54f59 
					 
					
						
						
							
							kill av_mallocz_static() calls in init_rl()  
						
						... 
						
						
						
						Originally committed as revision 8402 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-03-14 13:19:19 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						efddbce9d0 
					 
					
						
						
							
							move RLTable stuff to its own header  
						
						... 
						
						
						
						Originally committed as revision 8401 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-03-14 12:29:32 +00:00