Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						baee313aa9 
					 
					
						
						
							
							avcodec/diracdec: Fix "warning: comparison of constant 4 with expression of type enum dirac_subband is always true [-Wtautological-constant-out-of-range-compare]"  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-09-08 20:47:47 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						5bedbc3da2 
					 
					
						
						
							
							avcodec/diracdec: remove unneeded assignment  
						
						... 
						
						
						
						Found-by: CSA
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-31 20:40:10 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
							
						
						b67a0e99ee 
					 
					
						
						
							
							diracdec: don't call ff_emulated_edge_mc_8 directly  
						
						... 
						
						
						
						Use the videodsp function pointer instead.
Signed-off-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-16 03:53:49 +02:00 
						 
				 
			
				
					
						
							
							
								James Almer 
							
						 
					 
					
						
						
							
						
						ad24256e7e 
					 
					
						
						
							
							diracdec: remove unused dsputil context  
						
						... 
						
						
						
						Signed-off-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-07-16 00:11:18 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						3790801f9c 
					 
					
						
						
							
							Merge commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b'  
						
						... 
						
						
						
						* commit '3c650efb81aaa3b395ba4606ee68a47ee4efb57b':
  dsputil: Move draw_edges() to mpegvideoencdsp
Conflicts:
	libavcodec/mpegvideo_enc.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-07 16:17:27 +02:00 
						 
				 
			
				
					
						
							
							
								Lou Logan 
							
						 
					 
					
						
						
							
						
						88f2586adb 
					 
					
						
						
							
							fix various typos  
						
						... 
						
						
						
						Signed-off-by: Lou Logan <lou@lrcd.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-06-03 10:58:19 -08:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						4a30f08505 
					 
					
						
						
							
							avcodec/diracdec: move mc buffer allocation to per frame  
						
						... 
						
						
						
						Fixes out of array accesses for non default buffers with large strides
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-05-19 06:41:32 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b8598f6ce6 
					 
					
						
						
							
							avcodec/diracdec: fix undefined behavior with shifts  
						
						... 
						
						
						
						Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-04-16 02:51:41 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						46375e9a97 
					 
					
						
						
							
							avcodec/diracdec: use av_malloc(z)_array  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-04-12 05:38:31 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7c6cf689d8 
					 
					
						
						
							
							avcodec/diracdec: allocate edges internally instead of depending on CODEC_FLAG_EMU_EDGE being not set  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-01-20 17:52:55 +01:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
							
						
						a91394f4de 
					 
					
						
						
							
							lavc/diracdec: check av_frame_alloc() failure.  
						
						
						
						
					 
					
						2013-12-30 10:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						fca7943850 
					 
					
						
						
							
							avcodec/diracdec: avoid depending on sizeof(AVFrame)  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-12-17 15:45:24 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						91e00c4a78 
					 
					
						
						
							
							Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'  
						
						... 
						
						
						
						* commit '458446acfa1441d283dacf9e6e545beb083b8bb0':
  lavc: Edge emulation with dst/src linesize
Conflicts:
	libavcodec/cavs.c
	libavcodec/h264.c
	libavcodec/hevc.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/rv34.c
	libavcodec/svq3.c
	libavcodec/vc1dec.c
	libavcodec/videodsp.h
	libavcodec/videodsp_template.c
	libavcodec/vp3.c
	libavcodec/vp8.c
	libavcodec/wmv2.c
	libavcodec/x86/videodsp.asm
	libavcodec/x86/videodsp_init.c
Changes to the asm are not merged, they are left for volunteers or
in their absence for later.
The changes this merge introduces are reordering of the function
arguments
See: face578d56michaelni@gmx.at > 
						
						
					 
					
						2013-11-15 15:07:10 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						b46f19100b 
					 
					
						
						
							
							cosmetics: group remaining .name and .long_name.  
						
						... 
						
						
						
						See b2bed9325 
						
						
					 
					
						2013-10-04 13:33:20 +00:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
							
						
						face578d56 
					 
					
						
						
							
							Rewrite emu_edge functions to have separate src/dst_stride arguments.  
						
						... 
						
						
						
						This allows supporting files for which the image stride is smaller than
the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file
or a 16x16 VP8 file with -fflags +emu_edge. 
						
						
					 
					
						2013-09-28 20:28:08 -04:00 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
							
						
						c341f734e5 
					 
					
						
						
							
							Convert multiplier for MV from int to ptrdiff_t.  
						
						... 
						
						
						
						This prevents emulated_edge_mc from not undoing mvy*stride-related
integer overflows.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-09-28 11:28:09 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						5dff269998 
					 
					
						
						
							
							avcodec/diracdec: use init_get_bits8()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-08-05 10:13:48 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						1ec94b0f06 
					 
					
						
						
							
							lavc: factorize ff_{thread_,re,}get_buffer error messages.  
						
						... 
						
						
						
						Coccinelle profile used:
  @@
  expression r, ctx, f, loglevel, str, flags;
  @@
  -if ((r = ff_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_get_buffer(ctx, f, flags)) < 0)
  +    return r;
  @@
  expression r, ctx, f, loglevel, str;
  @@
  -if ((r = ff_reget_buffer(ctx, f)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_reget_buffer(ctx, f)) < 0)
  +    return r;
  @@
  expression r, ctx, f, loglevel, str, flags;
  @@
  -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) {
  -    av_log(ctx, loglevel, str);
  -    return r;
  -}
  +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0)
  +    return r;
...along with some manual patches for the remaining ones. 
						
						
					 
					
						2013-03-13 19:00:10 +01: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 
						 
				 
			
				
					
						
							
							
								Ronald S. Bultje 
							
						 
					 
					
						
						
							
						
						c7e3e55429 
					 
					
						
						
							
							Move ff_emulated_edge_mc prototypes to videodsp.  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-02-11 01:03:33 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						30981a966f 
					 
					
						
						
							
							lavc: split snow and dirac DWTs  
						
						... 
						
						
						
						There is only about 4 lines of common code, so it alot cleaner
when seperated.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-01-14 22:59:05 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						f5d6b0c9c2 
					 
					
						
						
							
							diracdec: fix typo in mctmp allocation  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-07 02:24:14 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						2f6ec9fdd7 
					 
					
						
						
							
							diracdec: Test mctmp and mcscratch for malloc failure.  
						
						... 
						
						
						
						Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-07 02:24:14 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b84d1bf193 
					 
					
						
						
							
							diracdec: fix emulated_edge condition, fix out of array reads  
						
						... 
						
						
						
						Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-07 02:24:14 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						4012cd6c4f 
					 
					
						
						
							
							lavc: fix decode_frame() third parameter semantics for rest of video decoders  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2012-12-05 18:24:43 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						874c5b02c4 
					 
					
						
						
							
							Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'  
						
						... 
						
						
						
						* commit '594d4d5df3c70404168701dd5c90b7e6e5587793':
  lavc: add a wrapper for AVCodecContext.get_buffer().
Conflicts:
	libavcodec/4xm.c
	libavcodec/8svx.c
	libavcodec/bmv.c
	libavcodec/cljr.c
	libavcodec/cscd.c
	libavcodec/dnxhddec.c
	libavcodec/dpcm.c
	libavcodec/dpx.c
	libavcodec/eacmv.c
	libavcodec/eamad.c
	libavcodec/frwu.c
	libavcodec/g723_1.c
	libavcodec/gifdec.c
	libavcodec/idcinvideo.c
	libavcodec/iff.c
	libavcodec/indeo3.c
	libavcodec/internal.h
	libavcodec/interplayvideo.c
	libavcodec/kmvc.c
	libavcodec/mpc7.c
	libavcodec/mpegaudiodec.c
	libavcodec/pcx.c
	libavcodec/pngdec.c
	libavcodec/pnmdec.c
	libavcodec/rl2.c
	libavcodec/snow.c
	libavcodec/targa.c
	libavcodec/tscc.c
	libavcodec/txd.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/vb.c
	libavcodec/vmdav.c
	libavcodec/vp56.c
	libavcodec/vqavideo.c
	libavcodec/wavpack.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/yop.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-05 15:18:12 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						3ba58433e1 
					 
					
						
						
							
							diracdec: check wavelet depth, prevent out of array read.  
						
						... 
						
						
						
						Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-11-11 17:20:36 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0a4087b893 
					 
					
						
						
							
							diracdec: Use only one frame per reference  
						
						... 
						
						
						
						Prevents null ptr dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-11-11 16:43:53 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7dab48bb73 
					 
					
						
						
							
							diracdec: allocate enough space for blocks  
						
						... 
						
						
						
						Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-11-11 04:01:39 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						dca2fa10d3 
					 
					
						
						
							
							diracdec: fix edge emulation check, fixes out of array reads  
						
						... 
						
						
						
						Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-11-11 03:34:40 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						7a72695c05 
					 
					
						
						
							
							Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'  
						
						... 
						
						
						
						* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.
Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-08-07 22:45:46 +02:00 
						 
				 
			
				
					
						
							
							
								Lou Logan 
							
						 
					 
					
						
						
							
						
						6851130fd6 
					 
					
						
						
							
							cosmetics: minor libavcodec spelling errors  
						
						... 
						
						
						
						Also update some common misspelled words in patcheck
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-06-29 14:54:15 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						3c1d52d30b 
					 
					
						
						
							
							Fix a few @file doxy inconsistencies.  
						
						
						
						
					 
					
						2012-05-04 18:50:59 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						601d072e68 
					 
					
						
						
							
							diracdec: check xybsep  
						
						... 
						
						
						
						Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-04-18 16:49:46 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						efe1ba7201 
					 
					
						
						
							
							diracdec: check lowdelay bytes.  
						
						... 
						
						
						
						Fixes division by zero
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-04-16 18:36:39 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						6a052e64b5 
					 
					
						
						
							
							direcdec: fix infinite loop  
						
						... 
						
						
						
						Fixes Ticket1156
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-04-01 16:11:29 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						0f13cc732b 
					 
					
						
						
							
							diracdec: Correct the bytestream end pointer.  
						
						... 
						
						
						
						This fixes some arith decoder overreads and a potential infinite loop.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-03-06 19:13:55 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ad21c05172 
					 
					
						
						
							
							diracdec: fix use of deprecated funnctions  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-02-16 23:01:47 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						5cd8afee99 
					 
					
						
						
							
							diracdec: Check for negative quants which would cause out of array reads.  
						
						... 
						
						
						
						Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-02-02 01:12:46 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9729f140ae 
					 
					
						
						
							
							diracdec: Fix integer overflow leading to out of global array read.  
						
						... 
						
						
						
						Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-01-30 20:35:09 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ddf0c1d86a 
					 
					
						
						
							
							diracdec: Check num_refs.  
						
						... 
						
						
						
						Fixes: CVE-2011-3950
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-01-26 17:05:57 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						e2291ea153 
					 
					
						
						
							
							diracdec: Check dirac_unpack_idwt_params parameters before storing them.  
						
						... 
						
						
						
						Fixes CVE-2011-3949
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-01-26 17:05:57 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						ba10207bbe 
					 
					
						
						
							
							Use more designated initializers.  
						
						... 
						
						
						
						Also remove some pointless NULL/0 assigments.
C++ code must be left as it is because named struct
initializers are not supported by C++ standard. 
						
						
					 
					
						2011-12-30 20:00:53 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						6718536ba5 
					 
					
						
						
							
							diracdec: fix empty data units.  
						
						... 
						
						
						
						Fixed Ticket636
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-11-14 18:14:20 +01:00 
						 
				 
			
				
					
						
							
							
								Jordi Ortiz 
							
						 
					 
					
						
						
							
						
						fca712df09 
					 
					
						
						
							
							Dirac: Specific struct initializers in AVCodec initialization  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-11-05 00:02:11 +01:00 
						 
				 
			
				
					
						
							
							
								Jordi Ortiz 
							
						 
					 
					
						
						
							
						
						aae7a5e36d 
					 
					
						
						
							
							Dirac: Removed goto + some code make up  
						
						... 
						
						
						
						(cherry picked from commit 8db434f8a6d210f7fd2f28ba325927d7a5dd04b9)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-11-04 23:59:33 +01:00 
						 
				 
			
				
					
						
							
							
								Jordi Ortiz 
							
						 
					 
					
						
						
							
						
						49aa397414 
					 
					
						
						
							
							Dirac: More formating  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-10-30 21:50:17 +01:00 
						 
				 
			
				
					
						
							
							
								Jordi Ortiz 
							
						 
					 
					
						
						
							
						
						ca239e1c37 
					 
					
						
						
							
							Dirac: Doxygen comments and some formatting enhancements  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-10-30 21:50:17 +01:00 
						 
				 
			
				
					
						
							
							
								Jordi Ortiz 
							
						 
					 
					
						
						
							
						
						e3cfe54145 
					 
					
						
						
							
							Dirac now returns AVFrames instead of DiracFrames  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-10-30 21:50:16 +01:00 
						 
				 
			
				
					
						
							
							
								multiple authors 
							
						 
					 
					
						
						
							
						
						5d50fcc549 
					 
					
						
						
							
							DIRAC Decoder stable version, MMX support removed.  
						
						... 
						
						
						
						Look for MMX_DISABLED to find the disabled functions.
Authors of this code are Marco Gerards <marco@gnu.org > and David Conrad <lessen42@gmail.com >
With changes from Jordi Ortiz <nenjordi@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2011-10-30 21:50:08 +01:00