mirror of https://git.ffmpeg.org/ffmpeg.git
gcc->C99 and warning fixes patch by (Dan Christiansen <danchr at daimi dot au dot dk>)
Originally committed as revision 2399 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
4cb3f3b637
commit
dc7cb06ae0
|
@ -208,8 +208,8 @@ extern int motion_estimation_method;
|
||||||
|
|
||||||
/* ME algos sorted by quality */
|
/* ME algos sorted by quality */
|
||||||
//FIXME remove IMHO
|
//FIXME remove IMHO
|
||||||
static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG,
|
static const __attribute__((unused)) int Motion_Est_QTab[] =
|
||||||
ME_X1, ME_EPZS, ME_FULL };
|
{ ME_ZERO, ME_PHODS, ME_LOG, ME_X1, ME_EPZS, ME_FULL };
|
||||||
|
|
||||||
|
|
||||||
#define FF_MAX_B_FRAMES 8
|
#define FF_MAX_B_FRAMES 8
|
||||||
|
|
|
@ -185,9 +185,9 @@ inline void dprintf(const char* fmt,...) {}
|
||||||
# else
|
# else
|
||||||
|
|
||||||
# ifdef DEBUG
|
# ifdef DEBUG
|
||||||
# define dprintf(fmt,args...) printf(fmt, ## args)
|
# define dprintf(fmt,...) printf(fmt, __VA_ARGS__)
|
||||||
# else
|
# else
|
||||||
# define dprintf(fmt,args...)
|
# define dprintf(fmt,...)
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# endif /* !CONFIG_WIN32 */
|
# endif /* !CONFIG_WIN32 */
|
||||||
|
|
|
@ -1293,7 +1293,7 @@ static const uint16_t dv_audio_shuffle625[12][9] = {
|
||||||
{ 31, 67, 103, 21, 57, 93, 11, 47, 83},
|
{ 31, 67, 103, 21, 57, 93, 11, 47, 83},
|
||||||
};
|
};
|
||||||
|
|
||||||
static const int dv_audio_frequency[3] = {
|
static const __attribute__((unused)) int dv_audio_frequency[3] = {
|
||||||
48000, 44100, 32000,
|
48000, 44100, 32000,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @file ffv1.c
|
* @file ffv1.c
|
||||||
* FF Video Codec 1 (a experimental lossless codec)
|
* FF Video Codec 1 (an experimental lossless codec)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
|
@ -876,7 +876,7 @@ static int ipvideo_decode_init(AVCodecContext *avctx)
|
||||||
|
|
||||||
if (s->avctx->extradata_size != sizeof(AVPaletteControl)) {
|
if (s->avctx->extradata_size != sizeof(AVPaletteControl)) {
|
||||||
printf (" Interplay video: expected extradata_size of %d\n",
|
printf (" Interplay video: expected extradata_size of %d\n",
|
||||||
sizeof(AVPaletteControl));
|
(int)sizeof(AVPaletteControl));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue