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)
commit43c57dbe14545d13dbfd8aae341b45514e8bcfbb
treed56f6c1e5688c8a701a86def28f5403006f29a3c
parentd84286b1ea1a59ecc770666a665ce71aa1e75c8f
parent888dcd86755d37e55fd74166f6d38ad66d41db58
Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'

* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
  h264_picture: Remove pointless dsputil.h #include

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