Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							0ee905e243 
							
						 
					 
					
						
						
							
							Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'  
						
						... 
						
						
						
						* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-11-16 23:54:10 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							426abbb632 
							
						 
					 
					
						
						
							
							avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-10-24 07:44:23 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							390c35a13b 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=qp  
						
						... 
						
						
						
						The filter does nothing.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-19 15:53:45 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							8302abf844 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=pullup  
						
						... 
						
						
						
						The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-18 11:05:27 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							7ac6c6325e 
							
						 
					 
					
						
						
							
							libavfilter/libmpcodecs: remove unused files  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-15 21:43:04 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							d2e237338d 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=fil  
						
						... 
						
						
						
						The filter does not work correctly most of time.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-05 20:22:47 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							0a8bb91505 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=dint  
						
						... 
						
						
						
						There are better and actually maintained filters that have similar
functionality.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-05 20:03:36 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							916549cb1e 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=phase  
						
						... 
						
						
						
						The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-03 14:05:38 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							ed448efe61 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=perspective  
						
						... 
						
						
						
						The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-07-14 16:27:18 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							852f74bd85 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=spp.  
						
						... 
						
						
						
						The filter was ported to a native libavfilter filter. 
						
						
					 
					
						2013-06-14 01:27:22 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							449558d34a 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=sab  
						
						... 
						
						
						
						The filter was ported to a native libavfilter filter. 
						
						
					 
					
						2013-06-05 00:06:51 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							ec34963276 
							
						 
					 
					
						
						
							
							lavfi/mp: drop mcdeint wrapper  
						
						... 
						
						
						
						It was ported to a native libavfilter filter. 
						
						
					 
					
						2013-06-01 22:35:20 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							3a2b9911bf 
							
						 
					 
					
						
						
							
							lavfi/mp/mcdeint: avoid uninited data read  
						
						... 
						
						
						
						Do not read padding or out-of-buffer values when computing the output
value for a pixel close to the image buffer edge.
This avoids non visible artifacts which affected the output checksum.
See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi/mp/mcdeint: avoid uninited data read
Date: Thu, 30 May 2013 18:57:14 +0200 
						
						
					 
					
						2013-06-01 22:34:50 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d686517ad1 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=ow wrapper.  
						
						... 
						
						
						
						Filter ported natively as owdenoise. 
						
						
					 
					
						2013-05-16 00:45:45 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							0400176772 
							
						 
					 
					
						
						
							
							lavfi/mp: remove mp=tinterlace wrapper  
						
						... 
						
						
						
						From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.
See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200 
						
						
					 
					
						2013-04-28 13:16:40 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							2f11aa141a 
							
						 
					 
					
						
						
							
							lavfi: remove mp=down3dright  
						
						... 
						
						
						
						Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-22 11:49:13 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							f0a149e538 
							
						 
					 
					
						
						
							
							lavfi: remove bad inverse telecine filters  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-17 11:51:16 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							32a7b858c9 
							
						 
					 
					
						
						
							
							lavfi: remove telecine libmpcodecs wrapper  
						
						... 
						
						
						
						Native, with more features, filter is available.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-11 11:22:11 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							9dc88ac367 
							
						 
					 
					
						
						
							
							lavfi: remove noise libmpcodecs wrapper  
						
						... 
						
						
						
						Native filter have reached similar performance.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-08 20:57:59 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							17c1881d58 
							
						 
					 
					
						
						
							
							lavfi: remove harddup libmpcodecs wrapper  
						
						... 
						
						
						
						It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-03-19 17:15:53 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							1c808943b8 
							
						 
					 
					
						
						
							
							lavfi/mp: drop mp=stereo3d filter  
						
						... 
						
						
						
						The filter has been natively integrated into libavfilter.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-03-05 18:45:35 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							73fce258b7 
							
						 
					 
					
						
						
							
							vf_mp: Set pseudo pal  
						
						... 
						
						
						
						Fixes ticket2140
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-23 19:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							7ca2f8b113 
							
						 
					 
					
						
						
							
							lavfi/mp: drop mp=kerndeint filter  
						
						... 
						
						
						
						The filter has been natively integrated into libavfilter. 
						
						
					 
					
						2013-02-17 11:48:45 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							8c85a9f046 
							
						 
					 
					
						
						
							
							lavfi/mp: drop mp=unsharp filter  
						
						... 
						
						
						
						The native filter is equivalent from the point of view of the features
and of performances. 
						
						
					 
					
						2013-02-17 11:48:37 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							41ae43cade 
							
						 
					 
					
						
						
							
							lavfi: remove softskip libmpcodecs wrapper  
						
						... 
						
						
						
						It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-02-14 12:51:56 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							968f8acec8 
							
						 
					 
					
						
						
							
							lavfi: remove dsize libmpcodecs wrapper  
						
						... 
						
						
						
						Filter does nothing, and supposed funcionality
is already available with native filter(s).
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-02-14 12:51:56 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a8918f2a 
							
						 
					 
					
						
						
							
							lavfi: remove mp=il filter  
						
						... 
						
						
						
						Native il video filter is now available.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-02-09 21:43:39 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							2b20397e1f 
							
						 
					 
					
						
						
							
							libmpcodecs/vd_ffmpeg.h: remove, its unused and removed upstream  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 15:54:39 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							81e357db62 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_pullup: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 15:41:19 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							13afcdd00e 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_uspp: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 15:41:00 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							3ce3d4cc3c 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_unsharp: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 15:40:43 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							7a4885600f 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_spp: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 14:53:53 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							14132599a3 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_sab: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 14:47:33 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							fe8bc6ddfc 
							
						 
					 
					
						
						
							
							libmpcodecs/pullup: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 14:47:13 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							8f7e3e678b 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_noise: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 14:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							3ca46d0c10 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_pp7:update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 14:17:28 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							fdd574ed3f 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_qp: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 14:17:17 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							b7e6622971 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_mcdeint: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 14:00:20 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							25ed6e99d7 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_ilpack: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 13:59:47 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							011702f5a9 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_ivtc: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 13:59:34 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							0b36a05c17 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_fspp: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 13:44:53 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							2b9eb6167b 
							
						 
					 
					
						
						
							
							libmpcodecs/av_helpers: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 13:43:35 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							e02c713fb1 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_filmdint: update to latest version from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 13:40:08 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							5d0115118d 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_divtc: update to latest version in mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 13:39:46 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							99a0813a7e 
							
						 
					 
					
						
						
							
							libhmpcodec/mp_msg: update to latest from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 13:02:28 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							745cb39d05 
							
						 
					 
					
						
						
							
							libmpcodecs/help_mp: update to latest from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 12:58:20 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							a54737f7ea 
							
						 
					 
					
						
						
							
							libmpcodecs/cpudetect: update to latest from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 12:55:10 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							103a2c2b17 
							
						 
					 
					
						
						
							
							libmpcodecs: update img_format.* & mp_image.* to latest from mplayer  
						
						... 
						
						
						
						Please see mplayer svn for authorship and individual commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 03:30:17 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
						
						
							
						
						
							708ed15d8c 
							
						 
					 
					
						
						
							
							libmpcodecs/vf_stereo3d: update to latest version from mplayer  
						
						... 
						
						
						
						Merged commits:
commit 9a2978f37bcdf7a28235c9322e9e5a4fe15e2ff2
Author: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Thu Jan 31 12:12:36 2013 +0000
    Add more vf_stereo3d output formats.
    Adds high quality green-magenta and yellow-blue dubois
    anaglyph 3D output support.
    Patch by thomas schorpp, thomas.schorpp gmail
    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35906 b3059339-0415-0410-9bf9-f77b7e298cf2
commit 2c50e66460d8d3ec460cbf9425f252f75ea1022d
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:31:47 2012 +0000
    Add another anaglyph color variant.
    Patch by Bob [mpbob ezpi net].
    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35080 b3059339-0415-0410-9bf9-f77b7e298cf2
commit 71c5261c2ac63e6e29a5a899b52d1ec4bdb62c4e
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:25:30 2012 +0000
    Convert comments into designated initializers.
    That is a simple way to ensure they always correspond
    to what the compiler actually does.
    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35079 b3059339-0415-0410-9bf9-f77b7e298cf2
commit d7164c5e1ba524c2a6983d979ef57e193b2c8a9f
Author: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Sun Aug 12 17:20:24 2012 +0000
    Make compiler give the ana_coeff array automatically the right size.
    Makes adding more colour schemes easier.
    git-svn-id: svn://svn.mplayerhq.hu:/mplayer/trunk@35078 b3059339-0415-0410-9bf9-f77b7e298cf2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-02-05 03:05:54 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8987591f 
							
						 
					 
					
						
						
							
							Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'  
						
						... 
						
						
						
						* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef
Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-23 17:44:56 +01:00