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)
* qatar/master:
  Drop pointless directory name prefixes from #includes in the current dir

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
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

Simple merge
Simple merge
Simple merge
diff --cc libavutil/des.c
Simple merge
Simple merge
   */
  
  #include "libavutil/avconfig.h"
- #include "libavutil/version.h"
+ #include "version.h"
  
 +#define AVPALETTE_SIZE 1024
 +#define AVPALETTE_COUNT 256
 +
  /**
   * Pixel format.
   *
Simple merge
Simple merge
Simple merge