diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:56:46 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:56:55 +0100 |
commit | 9b1a0c2ee82f3b99584857db1ea662e2d08aca7f (patch) | |
tree | aa364f6228cb3d925e35a718e58684fdced69002 /libavcodec/ra144dec.c | |
parent | 6fbddc80d63ddbc8974f4b2e286de20def6c201d (diff) | |
parent | 76b19a3984359b3be44d4f7e4e69b7b86729a622 (diff) | |
download | ffmpeg-9b1a0c2ee82f3b99584857db1ea662e2d08aca7f.tar.gz |
Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
Fix a number of incorrect intmath.h #includes.
avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ra144dec.c')
-rw-r--r-- | libavcodec/ra144dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/ra144dec.c b/libavcodec/ra144dec.c index 61b182eb8c..f12954b2f7 100644 --- a/libavcodec/ra144dec.c +++ b/libavcodec/ra144dec.c @@ -23,7 +23,6 @@ */ #include "libavutil/channel_layout.h" -#include "libavutil/intmath.h" #include "avcodec.h" #include "get_bits.h" #include "internal.h" |