Clément Bœsch 
							
						 
					 
					
						
						
							
						
						8ef57a0d61 
					 
					
						
						
							
							Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'  
						
						... 
						
						
						
						* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
  cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me > 
						
						
					 
					
						2016-06-21 21:55:34 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
							
						
						41ed7ab45f 
					 
					
						
						
							
							cosmetics: Fix spelling mistakes  
						
						... 
						
						
						
						Signed-off-by: Diego Biurrun <diego@biurrun.de > 
						
						
					 
					
						2016-05-04 18:16:21 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						218f58a16a 
					 
					
						
						
							
							Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'  
						
						... 
						
						
						
						* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
  mpegvideo: h263: Move all tables to a single file
Conflicts:
	libavcodec/h263.h
	libavcodec/h263data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-06-12 20:57:37 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
							
						
						e3d0f49abb 
					 
					
						
						
							
							mpegvideo: h263: Move all tables to a single file  
						
						
						
						
					 
					
						2015-06-12 12:26:04 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f6c524a939 
					 
					
						
						
							
							Merge commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845'  
						
						... 
						
						
						
						* commit '0c69164f451cc9ca6ce9d6e7568083e2776bc845':
  h263: Convert function to macro
Conflicts:
	libavcodec/h263.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-04-29 04:11:21 +02:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
							
						
						0c69164f45 
					 
					
						
						
							
							h263: Convert function to macro  
						
						
						
						
					 
					
						2015-04-28 16:33:09 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						581b5f0b9b 
					 
					
						
						
							
							Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'  
						
						... 
						
						
						
						* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context
Conflicts:
	configure
	libavcodec/aic.c
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/asvdec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dvdec.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/intrax8.c
	libavcodec/mdec.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc_common.h
	libavcodec/mpegvideo.c
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-01 15:22:11 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						e3fcb14347 
					 
					
						
						
							
							dsputil: Split off IDCT bits into their own context  
						
						
						
						
					 
					
						2014-06-30 07:58:46 -07:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9517900bef 
					 
					
						
						
							
							Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'  
						
						... 
						
						
						
						* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
  mpegvideo: move mpegvideo formats-related defines to mpegutils.h
Conflicts:
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_mvpred.h
	libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-03-17 12:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Vittorio Giovara 
							
						 
					 
					
						
						
							
						
						e0c16e4e32 
					 
					
						
						
							
							mpegvideo: move mpegvideo formats-related defines to mpegutils.h  
						
						
						
						
					 
					
						2014-03-16 23:04:41 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a30f7918b5 
					 
					
						
						
							
							Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'  
						
						... 
						
						
						
						* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext
Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-11-08 17:42:56 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						0338c39698 
					 
					
						
						
							
							dsputil: Split off H.263 bits into their own H263DSPContext  
						
						
						
						
					 
					
						2013-11-08 12:40:47 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						efc08e00cc 
					 
					
						
						
							
							Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'  
						
						... 
						
						
						
						* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft
Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-16 09:56:43 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						2832ea26f3 
					 
					
						
						
							
							Remove commented-out debug #define cruft  
						
						
						
						
					 
					
						2013-05-16 00:23:30 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						80e9e63c94 
					 
					
						
						
							
							Merge commit '759001c534287a96dc96d1e274665feb7059145d'  
						
						... 
						
						
						
						* commit '759001c534287a96dc96d1e274665feb7059145d':
  lavc decoders: work with refcounted frames.
Anton Khirnov (1):
      lavc decoders: work with refcounted frames.
Clément Bœsch (47):
      lavc/ansi: reset file
      lavc/ansi: re-do refcounted frame changes from Anton
      fraps: reset file
      lavc/fraps: switch to refcounted frames
      gifdec: reset file
      lavc/gifdec: switch to refcounted frames
      dsicinav: resolve conflicts
      smc: resolve conflicts
      zmbv: resolve conflicts
      rpza: resolve conflicts
      vble: resolve conflicts
      xxan: resolve conflicts
      targa: resolve conflicts
      vmnc: resolve conflicts
      utvideodec: resolve conflicts
      tscc: resolve conflicts
      ulti: resolve conflicts
      ffv1dec: resolve conflicts
      dnxhddec: resolve conflicts
      v210dec: resolve conflicts
      vp3: resolve conflicts
      vcr1: resolve conflicts
      v210x: resolve conflicts
      wavpack: resolve conflicts
      pngdec: fix compilation
      roqvideodec: resolve conflicts
      pictordec: resolve conflicts
      mdec: resolve conflicts
      tiertexseqv: resolve conflicts
      smacker: resolve conflicts
      vb: resolve conflicts
      vqavideo: resolve conflicts
      xl: resolve conflicts
      tmv: resolve conflicts
      vmdav: resolve conflicts
      truemotion1: resolve conflicts
      truemotion2: resolve conflicts
      lcldec: fix compilation
      libcelt_dec: fix compilation
      qdrw: fix compilation
      r210dec: fix compilation
      rl2: fix compilation
      wnv1: fix compilation
      yop: fix compilation
      tiff: resolve conflicts
      interplayvideo: fix compilation
      qpeg: resolve conflicts (FIXME/TESTME).
Hendrik Leppkes (33):
      012v: convert to refcounted frames
      8bps: fix compilation
      8svx: resolve conflicts
      4xm: resolve conflicts
      aasc: resolve conflicts
      bfi: fix compilation
      aura: fix compilation
      alsdec: resolve conflicts
      avrndec: convert to refcounted frames
      avuidec: convert to refcounted frames
      bintext: convert to refcounted frames
      cavsdec: resolve conflicts
      brender_pix: convert to refcounted frames
      cinepak: resolve conflicts
      cinepak: avoid using AVFrame struct directly in private context
      cljr: fix compilation
      cpia: convert to refcounted frames
      cscd: resolve conflicts
      iff: resolve conflicts and do proper conversion to refcounted frames
      4xm: fix reference frame handling
      cyuv: fix compilation
      dxa: fix compilation
      eacmv: fix compilation
      eamad: fix compilation
      eatgv: fix compilation
      escape124: remove unused variable.
      escape130: convert to refcounted frames
      evrcdec: convert to refcounted frames
      exr: convert to refcounted frames
      mvcdec: convert to refcounted frames
      paf: properly free the frame data on decode close
      sgirle: convert to refcounted frames
      lavfi/moviesrc: use refcounted frames
Michael Niedermayer (56):
      Merge commit '759001c534287a96dc96d1e274665feb7059145d'
      resolve conflicts in headers
      motion_est: resolve conflict
      mpeg4videodec: fix conflicts
      dpcm conflict fix
      dpx: fix conflicts
      indeo3: resolve confilcts
      kmvc: resolve conflicts
      kmvc: resolve conflicts
      h264: resolve conflicts
      utils: resolve conflicts
      rawdec: resolve conflcits
      mpegvideo: resolve conflicts
      svq1enc: resolve conflicts
      mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
      pthreads: resolve conflicts
      frame_thread_encoder: simple compilefix not yet tested
      snow: update to buffer refs
      crytsalhd: fix compile
      dirac: switch to new API
      sonic: update to new API
      svq1: resolve conflict, update to new API
      ffwavesynth: update to new buffer API
      g729: update to new API
      indeo5: fix compile
      j2kdec: update to new buffer API
      linopencore-amr: fix compile
      libvorbisdec: update to new API
      loco: fix compile
      paf: update to new API
      proresdec: update to new API
      vp56: update to new api / resolve conflicts
      xface: convert to refcounted frames
      xan: fix compile&fate
      v408: update to ref counted buffers
      v308: update to ref counted buffers
      yuv4dec: update to ref counted buffers
      y41p: update to ref counted frames
      xbm: update to refcounted frames
      targa_y216: update to refcounted buffers
      qpeg: fix fate/crash
      cdxl: fix fate
      tscc: fix reget buffer useage
      targa_y216dec: fix style
      msmpeg4: fix fate
      h264: ref_picture() copy fields that have been lost too
      update_frame_pool: use channel field
      h264: Put code that prevents deadlocks back
      mpegvideo: dont allow last == current
      wmalossless: fix buffer ref messup
      ff_alloc_picture: free tables in case of dimension mismatches
      h264: fix null pointer dereference and assertion failure
      frame_thread_encoder: update to bufrefs
      ec: fix used arrays
      snowdec: fix off by 1 error in dimensions check
      h264: disallow single unpaired fields as references of frames
Paul B Mahol (2):
      lavc/vima: convert to refcounted frames
      sanm: convert to refcounted frames
Conflicts:
	libavcodec/4xm.c
	libavcodec/8bps.c
	libavcodec/8svx.c
	libavcodec/aasc.c
	libavcodec/alsdec.c
	libavcodec/anm.c
	libavcodec/ansi.c
	libavcodec/avs.c
	libavcodec/bethsoftvideo.c
	libavcodec/bfi.c
	libavcodec/c93.c
	libavcodec/cavsdec.c
	libavcodec/cdgraphics.c
	libavcodec/cinepak.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/dsicinav.c
	libavcodec/dvdec.c
	libavcodec/dxa.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/eatgq.c
	libavcodec/eatgv.c
	libavcodec/eatqi.c
	libavcodec/error_resilience.c
	libavcodec/escape124.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/flicvideo.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_direct.c
	libavcodec/h264_loopfilter.c
	libavcodec/h264_refs.c
	libavcodec/huffyuvdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo2.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/jvdec.c
	libavcodec/kgv1dec.c
	libavcodec/kmvc.c
	libavcodec/lagarith.c
	libavcodec/libopenjpegdec.c
	libavcodec/mdec.c
	libavcodec/mimic.c
	libavcodec/mjpegbdec.c
	libavcodec/mjpegdec.c
	libavcodec/mmvideo.c
	libavcodec/motion_est.c
	libavcodec/motionpixels.c
	libavcodec/mpc7.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/msrle.c
	libavcodec/msvideo1.c
	libavcodec/nuv.c
	libavcodec/options_table.h
	libavcodec/pcx.c
	libavcodec/pictordec.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/pthread.c
	libavcodec/qpeg.c
	libavcodec/qtrle.c
	libavcodec/r210dec.c
	libavcodec/rawdec.c
	libavcodec/roqvideodec.c
	libavcodec/rpza.c
	libavcodec/smacker.c
	libavcodec/smc.c
	libavcodec/svq1dec.c
	libavcodec/svq1enc.c
	libavcodec/targa.c
	libavcodec/tiertexseqv.c
	libavcodec/tiff.c
	libavcodec/tmv.c
	libavcodec/truemotion1.c
	libavcodec/truemotion2.c
	libavcodec/tscc.c
	libavcodec/ulti.c
	libavcodec/utils.c
	libavcodec/utvideodec.c
	libavcodec/v210dec.c
	libavcodec/v210x.c
	libavcodec/vb.c
	libavcodec/vble.c
	libavcodec/vcr1.c
	libavcodec/vmdav.c
	libavcodec/vmnc.c
	libavcodec/vp3.c
	libavcodec/vp56.c
	libavcodec/vp56.h
	libavcodec/vp6.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/xl.c
	libavcodec/xxan.c
	libavcodec/zmbv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-03-12 03:23:28 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
							
						
						759001c534 
					 
					
						
						
							
							lavc decoders: work with refcounted frames.  
						
						
						
						
					 
					
						2013-03-08 07:38:30 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a984efd104 
					 
					
						
						
							
							Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'  
						
						... 
						
						
						
						* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
  Remove unnecessary dsputil.h #includes
Conflicts:
	libavcodec/ffv1.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c
	libavcodec/h264pred.c
	libavcodec/lpc.h
	libavcodec/mjpegdec.c
	libavcodec/rectangle.h
	libavcodec/x86/idct_sse2_xvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-02-26 13:05:10 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						c242bbd8b6 
					 
					
						
						
							
							Remove unnecessary dsputil.h #includes  
						
						
						
						
					 
					
						2013-02-26 00:51:34 +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 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						88bd7fdc82 
					 
					
						
						
							
							Drop DCTELEM typedef  
						
						... 
						
						
						
						It does not help as an abstraction and adds dsputil dependencies.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com > 
						
						
					 
					
						2013-01-22 18:32:56 -08:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						988f585fcb 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master: (44 commits)
  replacement Indeo 3 decoder
  gsm demuxer: do not allocate packet twice.
  flvenc: use first packet delay as global delay.
  ac3enc: doxygen update.
  imc: return error codes instead of 0 for error conditions.
  imc: return meaningful error codes instead of -1
  imc: do not set channel layout for stereo
  imc: validate channel count
  imc: check for ff_fft_init() failure
  imc: check output buffer size before decoding
  imc: use DSPContext.bswap16_buf() to byte-swap packet data
  rtsp: add allowed_media_types option
  libgsm: add flush function to reset the decoder state when seeking
  libgsm: simplify decoding by using a loop
  gsm: log error message when packet is too small
  libgsmdec: do not needlessly set *data_size to 0
  gsmdec: do not needlessly set *data_size to 0
  gsmdec: add flush function to reset the decoder state when seeking
  libgsmdec: check output buffer size before decoding
  gsmdec: log error message when output buffer is too small.
  ...
Conflicts:
	Changelog
	ffplay.c
	libavcodec/indeo3.c
	libavcodec/mjpeg_parser.c
	libavcodec/vp3.c
	libavformat/cutils.c
	libavformat/id3v2.c
	libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-11-03 02:16:26 +01:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						124e28847b 
					 
					
						
						
							
							Remove some stray unnecessary ffmpeg references.  
						
						
						
						
					 
					
						2011-11-02 10:42:54 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						e10979ff56 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac7michaelni@gmx.at > 
						
						
					 
					
						2011-07-12 01:42:32 +02:00 
						 
				 
			
				
					
						
							
							
								Diego Biurrun 
							
						 
					 
					
						
						
							
						
						657ccb5ac7 
					 
					
						
						
							
							Eliminate FF_COMMON_FRAME macro.  
						
						... 
						
						
						
						FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture.  Replace by an embedded AVFrame structure in struct Picture. 
						
						
					 
					
						2011-07-11 00:19:00 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						ce5e49b0c2 
					 
					
						
						
							
							replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*  
						
						
						
						
					 
					
						2011-05-02 16:41:41 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						975a1447f7 
					 
					
						
						
							
							Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.  
						
						... 
						
						
						
						Signed-off-by: Diego Biurrun <diego@biurrun.de > 
						
						
					 
					
						2011-05-02 12:18:44 +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 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						fc4a2d1e8c 
					 
					
						
						
							
							Change ref_index structure so it matches how its organized in h264.  
						
						... 
						
						
						
						Also revert the related error concealment hotfix.
Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-03-23 02:17:04 +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 
							
						 
					 
					
						
						
							
						
						a7ac9c2f62 
					 
					
						
						
							
							Move 3 direct MV related functions that i left out from h263.c to mpeg4video.c.  
						
						... 
						
						
						
						Originally committed as revision 21104 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-08 19:59:51 +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 
							
						 
					 
					
						
						
							
						
						51ce2207c8 
					 
					
						
						
							
							Add a few CONFIG_MPEG4_DECODER that should be there.  
						
						... 
						
						
						
						Originally committed as revision 21082 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-08 04:00:06 +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 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						46244c640c 
					 
					
						
						
							
							Add some const qualifiers.  
						
						... 
						
						
						
						Originally committed as revision 21064 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 15:46:45 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						616251c924 
					 
					
						
						
							
							Document decide_ac_pred() and restore_ac_coeffs().  
						
						... 
						
						
						
						Originally committed as revision 21063 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 15:43:49 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						d6856c5708 
					 
					
						
						
							
							Move restore_ac_coeffs() call into decode_ac_pred().  
						
						... 
						
						
						
						This makes decode_ac_pred() easier to understand.
Originally committed as revision 21062 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 15:31:54 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0dc5dc08db 
					 
					
						
						
							
							Move restore_ac_coeffs() up so its declared before its use.  
						
						... 
						
						
						
						Originally committed as revision 21061 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 15:24:50 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						64f716b499 
					 
					
						
						
							
							More doxy  
						
						... 
						
						
						
						Originally committed as revision 21060 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 15:12:31 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						4fea04820b 
					 
					
						
						
							
							Factorize if() surrounding every ff_h263_show_pict_info() call.  
						
						... 
						
						
						
						Originally committed as revision 21058 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 14:55:11 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						d7525cba23 
					 
					
						
						
							
							Split out intel H263 decoder.  
						
						... 
						
						
						
						Originally committed as revision 21054 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 06:25:41 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a0b0d75368 
					 
					
						
						
							
							Split flv decoding out.  
						
						... 
						
						
						
						Originally committed as revision 21051 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 05:36:45 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						eb52376915 
					 
					
						
						
							
							Split out flv encoding.  
						
						... 
						
						
						
						Originally committed as revision 21050 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 04:42:39 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f867378771 
					 
					
						
						
							
							Document aspect_to_info().  
						
						... 
						
						
						
						Originally committed as revision 21049 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 04:01:19 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f016159416 
					 
					
						
						
							
							Cleanup aspect_to_info().  
						
						... 
						
						
						
						Originally committed as revision 21048 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 03:58:12 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						214cb565c0 
					 
					
						
						
							
							Document several more things.  
						
						... 
						
						
						
						Originally committed as revision 21047 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 03:54:10 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b0704443f2 
					 
					
						
						
							
							Document *VLC_BITS.  
						
						... 
						
						
						
						Originally committed as revision 21046 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 03:40:41 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						046be9299f 
					 
					
						
						
							
							Simplify h263_get_picture_format().  
						
						... 
						
						
						
						Originally committed as revision 21045 to svn://svn.ffmpeg.org/ffmpeg/trunk 
						
						
					 
					
						2010-01-07 03:36:46 +00:00