Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Sep 2013 10:50:55 +0000 (12:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Sep 2013 10:51:01 +0000 (12:51 +0200)
commit803445e02c773fc29040629abdc297534ab6c3f3
treef4af5e0b5e8527a7d6a280978d569502dd1e4d24
parentc45e9097d839e69ab74160386db5e9728deaaf62
parenta0b901a348e435f0234440736670fc9e8fcca836
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Drop pointless directory name prefixes from #includes in the current dir

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/s3tc.c
libavutil/blowfish.c
libavutil/des.c
libavutil/float_dsp.c
libavutil/pixfmt.h
libavutil/time.c
libavutil/xtea.c
libswscale/rgb2rgb.h