Michael Niedermayer 6e9f3f3b65 Merge commit '238614de679a71970c20d7c3fee08a322967ec40' ...

* commit '238614de679a71970c20d7c3fee08a322967ec40':
  cdgraphics: do not rely on get_buffer() initializing the frame.
  svq1: replace struct svq1_frame_size with an array.
  vf_yadif: silence a warning.

Conflicts:
	libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-02-06 14:53:49 +01:00

..

af_volume_init.c

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

af_volume.asm

Fix compilation with yasm 0.6.2.

2012-12-07 00:26:45 +01:00

Makefile

avfilter: x86: consistent filenames for filter optimizations

2013-02-04 15:00:47 +01:00

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2013-02-05 11:56:48 +01:00

vf_hqdn3d_init.c

avfilter/x86/vf_hqdn3d_init: fix author attribution & project name

2013-02-02 13:18:09 +01:00

vf_hqdn3d.asm

Merge remote-tracking branch 'qatar/master'

2013-02-05 11:56:48 +01:00

vf_yadif_init.c

Merge commit '238614de679a71970c20d7c3fee08a322967ec40'

2013-02-06 14:53:49 +01:00

vf_yadif.asm

Merge remote-tracking branch 'qatar/master'

2013-02-05 11:56:48 +01:00