virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2013-02-26 13:05:10 +01:00
parent 9b1a0c2ee8 c242bbd8b6
commit a984efd104
120 changed files with 5 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/rtjpeg.c
View File

@@ -20,7 +20,6 @@
*/
#include "libavutil/common.h"
#include "get_bits.h"
#include "dsputil.h"
#include "rtjpeg.h"
#define PUT_COEFF(c) \