diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:50:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-11 12:51:01 +0200 |
| commit | 803445e02c773fc29040629abdc297534ab6c3f3 (patch) | |
| tree | f4af5e0b5e8527a7d6a280978d569502dd1e4d24 /libavutil/blowfish.c | |
| parent | c45e9097d839e69ab74160386db5e9728deaaf62 (diff) | |
| parent | a0b901a348e435f0234440736670fc9e8fcca836 (diff) | |
| download | ffmpeg-803445e02c773fc29040629abdc297534ab6c3f3.tar.gz | |
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>
Diffstat (limited to 'libavutil/blowfish.c')
| -rw-r--r-- | libavutil/blowfish.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavutil/blowfish.c b/libavutil/blowfish.c index 5ad74c10fd..3821427570 100644 --- a/libavutil/blowfish.c +++ b/libavutil/blowfish.c @@ -21,10 +21,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/intreadwrite.h" - #include "avutil.h" #include "common.h" +#include "intreadwrite.h" #include "blowfish.h" static const uint32_t orig_p[AV_BF_ROUNDS + 2] = { |