Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:16:57 +0000 (15:16 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:16:57 +0000 (15:16 +0200)
* commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b':
  lavc: Sanitize header inclusion guards

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/dct32.h
libavcodec/hqxdsp.h
libavcodec/mpegutils.h
libavcodec/pngdsp.h
libavcodec/twinvq.h
libavcodec/wma_freqs.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge