diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 20:55:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-15 20:56:06 +0200 |
| commit | 90d8506fbf1b5d9bd6ed1f01a8610df01771e3c3 (patch) | |
| tree | 36f219ad7d67eca3542a179e6eb0d84fcf3367e4 /libavformat | |
| parent | be32145e9da7b8a7150011ba98bf411fd720c060 (diff) | |
| parent | fbc57405664876cb7f47f1ac264db16a3014e665 (diff) | |
| download | ffmpeg-90d8506fbf1b5d9bd6ed1f01a8610df01771e3c3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64
segment: remove unnecessary <strings.h> include
fate: add snow hpel tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/segment.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index 09949d7aeb..6025aad806 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <strings.h> #include <float.h> #include "avformat.h" |