Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 20:34:10 +0000 (22:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 20:34:16 +0000 (22:34 +0200)
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
  h264_picture: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_picture.c

Simple merge