Skip to content
Snippets Groups Projects
Commit a984efd1 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'c242bbd8'


* commit 'c242bbd8':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9b1a0c2e c242bbd8
No related branches found
No related tags found
No related merge requests found
Showing
with 0 additions and 20 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment