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ö 
							
						 
					 
					
						
						
							
						
						ddce8953a5 
					 
					
						
						
							
							h263: Add ff_ prefix to nonstatic symbols  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st > 
						
						
					 
					
						2012-02-15 22:06:22 +02:00 
						 
				 
			
				
					
						
							
							
								Reimar Döffinger 
							
						 
					 
					
						
						
							
						
						49baf44c24 
					 
					
						
						
							
							Make ff_mba_* arrays const.  
						
						... 
						
						
						
						Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de > 
						
						
					 
					
						2011-11-05 15:37:02 +01: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 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						aa11ce6568 
					 
					
						
						
							
							Make inter_level/run global again, msmpeg4 uses them.  
						
						... 
						
						
						
						... I did test but it wasnt recompiled ...
Originally committed as revision 21112 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-09 18:12:06 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0366b6e199 
					 
					
						
						
							
							Make some tables static again, i mistakely thought they would be used in several  
						
						... 
						
						
						
						places.
Originally committed as revision 21111 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-09 17:22:37 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						fc53b6afee 
					 
					
						
						
							
							Split H263 encoder and decoder from common code.  
						
						... 
						
						
						
						Originally committed as revision 21109 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-09 14:59:06 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						101ada9abd 
					 
					
						
						
							
							Rename most non static h263 tables so their name contains h263.  
						
						... 
						
						
						
						Originally committed as revision 21098 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-08 17:51:48 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ca334dd14b 
					 
					
						
						
							
							Split the mpeg4 encoder and decoder off h263.c  
						
						... 
						
						
						
						Originally committed as revision 21079 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 23:53:49 +00:00 
						 
				 
			
				
					
						
							
							
								avcoder 
							
						 
					 
					
						
						
							
						
						b02e9c962b 
					 
					
						
						
							
							The H.263 wrong_run table is only for encoding; only enable it in such cases.  
						
						... 
						
						
						
						patch by avcoder, ffmpeg gmail com
Originally committed as revision 21013 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-04 13:21:18 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Guillaume Poirier 
							
						 
					 
					
						
						
							
						
						efb775777f 
					 
					
						
						
							
							add a comment to indicate which #endif belong to which #define  
						
						... 
						
						
						
						Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-17 18:59:28 +00:00 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						699b3f99d0 
					 
					
						
						
							
							add multiple inclusion guards to headers  
						
						... 
						
						
						
						Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2007-06-17 00:01:30 +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 
						 
				 
			
				
					
						
							
							
								Måns Rullgård 
							
						 
					 
					
						
						
							
						
						7b7abda3b3 
					 
					
						
						
							
							make more tables static  
						
						... 
						
						
						
						Originally committed as revision 6996 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-11-12 23:14:20 +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 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						04d7f60143 
					 
					
						
						
							
							Add official LGPL license headers to the files that were missing them.  
						
						... 
						
						
						
						Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-09-10 14:02:42 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						3aeefb93c8 
					 
					
						
						
							
							out of array read fix  
						
						... 
						
						
						
						Originally committed as revision 5142 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2006-03-10 21:20:49 +00:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						115329f160 
					 
					
						
						
							
							COSMETICS: Remove all trailing whitespace.  
						
						... 
						
						
						
						Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2005-12-17 18:14:38 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c26ae41db2 
					 
					
						
						
							
							adding a few const  
						
						... 
						
						
						
						Originally committed as revision 4337 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2005-06-01 21:19:00 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						bb198e198a 
					 
					
						
						
							
							interlaced motion estimation  
						
						... 
						
						
						
						interlaced mpeg2 encoding
  P & B frames
  rate distored interlaced mb decission
  alternate scantable support
4mv encoding fixes (thats also why the regression tests change)
passing height to most dsp functions
interlaced mpeg4 encoding (no direct mode MBs yet)
various related cleanups
disabled old motion estimaton algorithms (log, full, ...) they will either be fixed or removed
Originally committed as revision 2638 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-12-30 16:07:57 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8135f8df52 
					 
					
						
						
							
							rv20 / h263 b frame fix  
						
						... 
						
						
						
						Originally committed as revision 2628 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-12-21 20:06:59 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b40cd4e0e4 
					 
					
						
						
							
							rv20 (h263) b frame decoding support  
						
						... 
						
						
						
						Originally committed as revision 2561 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-12-04 18:34:47 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						332f9ac4e3 
					 
					
						
						
							
							h263 loop filter  
						
						... 
						
						
						
						fixed h263 modified quantization
CODEC_FLAG_OBMC
Originally committed as revision 2549 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-12-01 15:23:14 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						68b94c354d 
					 
					
						
						
							
							rv20 decoder  
						
						... 
						
						
						
						Originally committed as revision 2543 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-11-30 14:35:35 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						3e8a5124a2 
					 
					
						
						
							
							forgot  
						
						... 
						
						
						
						Originally committed as revision 2542 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-11-29 08:44:33 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7af75e6c65 
					 
					
						
						
							
							h263 stuffing decode fix  
						
						... 
						
						
						
						Originally committed as revision 2304 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-09-26 22:18:25 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						983e3246b7 
					 
					
						
						
							
							per file doxy  
						
						... 
						
						
						
						Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-03-06 11:32:04 +00:00 
						 
				 
			
				
					
						
							
							
								Zdenek Kabelac 
							
						 
					 
					
						
						
							
						
						0c1a9edad4 
					 
					
						
						
							
							* UINTX -> uintx_t   INTX -> intx_t  
						
						... 
						
						
						
						Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2003-02-11 16:35:48 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						8f8402e49c 
					 
					
						
						
							
							dc scale simplification/optimization  
						
						... 
						
						
						
						Originally committed as revision 695 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-06-18 00:46:02 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						287229e554 
					 
					
						
						
							
							msmpeg4v1 decoding  
						
						... 
						
						
						
						Originally committed as revision 643 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-06-02 12:22:30 +00:00 
						 
				 
			
				
					
						
							
							
								Juanjo 
							
						 
					 
					
						
						
							
						
						ef5b1b5a7e 
					 
					
						
						
							
							- Advanced Intra Coding (AIC) support for H.263+ encoder, just DC by now.  
						
						... 
						
						
						
						- Bug fix H.263+ AIC tables.
- Warning fixes.
Originally committed as revision 431 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-05-02 04:39:45 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						84afee348f 
					 
					
						
						
							
							msmpeg4v2 decoding (no encoding yet)  
						
						... 
						
						
						
						Originally committed as revision 376 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-04-05 04:09:04 +00:00 
						 
				 
			
				
					
						
							
							
								Juanjo 
							
						 
					 
					
						
						
							
						
						d140623fc4 
					 
					
						
						
							
							- H.263+ decoder support for Advanded INTRA Coding (buggy)  
						
						... 
						
						
						
						Originally committed as revision 310 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2002-02-18 19:33:27 +00:00 
						 
				 
			
				
					
						
							
							
								Juanjo 
							
						 
					 
					
						
						
							
						
						96815ce9e2 
					 
					
						
						
							
							- Added support to Inter4V+Q MBs to H.263 decoder.  
						
						... 
						
						
						
						- Advanced Prediction Mode activated for H.263 decoder.
- Bug fixed on H.263+ header parsing for UFEP.
- Now we can decode VIVO v1 streams :)
Originally committed as revision 221 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-11-17 21:14:54 +00:00 
						 
				 
			
				
					
						
							
							
								Juanjo 
							
						 
					 
					
						
						
							
						
						4949028f85 
					 
					
						
						
							
							- Bug fix on inter MCBPC table for inter+q.  
						
						... 
						
						
						
						- H.263/H.263+ decoder now knows GOB start codes.
- H.263/H.263+ decoder now returns the size of the stream on the first call.
- Added show_bits() functions to see the buffer without loosing the bits.
- TODO: H.263v1 UMV parsing is buggy.
Originally committed as revision 204 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-11-03 00:49:53 +00:00 
						 
				 
			
				
					
						
							
							
								Fabrice Bellard 
							
						 
					 
					
						
						
							
						
						de6d9b6404 
					 
					
						
						
							
							Initial revision  
						
						... 
						
						
						
						Originally committed as revision 5 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2001-07-22 14:18:56 +00:00