FFmpeg/libavcodec
Michael Niedermayer 2fd87a3d78 Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'
* commit '998c9f15d1ca8c7489775ebcca51623b915988f1':
  idct: remove call to ff_idctdsp_init from ff_MPV_common_init

Conflicts:
	libavcodec/dnxhdenc.c
	libavcodec/h263dec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 02:25:14 +02:00
..
2014-07-16 20:55:24 +02:00
2014-08-14 13:35:24 +02:00
2014-08-14 04:24:14 +02:00
2014-08-12 10:03:20 +00:00
2014-08-06 12:38:26 +02:00
2014-08-09 23:20:31 +02:00
2014-08-12 21:58:45 +02:00
2014-08-05 01:54:47 +02:00
2014-07-21 01:25:33 -07:00
2014-07-18 13:31:19 +02:00
2014-07-12 22:33:27 +02:00
2014-07-10 15:29:54 +02:00
2014-08-12 21:58:45 +02:00
2014-08-12 21:58:45 +02:00