diff options
| -rw-r--r-- | cmdutils.c | 4 | ||||
| -rw-r--r-- | ffmpeg.c | 18 | ||||
| -rw-r--r-- | ffplay.c | 2 | ||||
| -rw-r--r-- | ffserver.c | 17 |
4 files changed, 30 insertions, 11 deletions
diff --git a/cmdutils.c b/cmdutils.c index 1557aaac4c..4d153b79ba 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -19,6 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <string.h> +#include <stdlib.h> +#include <errno.h> + #include "avformat.h" #include "cmdutils.h" #include "avstring.h" @@ -19,6 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#include <ctype.h> +#include <string.h> +#include <math.h> +#include <stdlib.h> +#include <errno.h> #include <signal.h> #include <limits.h> #include "avformat.h" @@ -1199,7 +1205,7 @@ static int output_packet(AVInputStream *ist, int ist_index, pkt->pts); break; default: - av_abort(); + abort(); } } else { AVFrame avframe; //FIXME/XXX remove this @@ -1535,7 +1541,7 @@ static int av_encode(AVFormatContext **output_files, case CODEC_TYPE_SUBTITLE: break; default: - av_abort(); + abort(); } } else { switch(codec->codec_type) { @@ -1571,7 +1577,7 @@ static int av_encode(AVFormatContext **output_files, codec->sample_rate, icodec->sample_rate); if(!ost->resample){ printf("Can't resample. Aborting.\n"); - av_abort(); + abort(); } } ist->decoding_needed = 1; @@ -1633,7 +1639,7 @@ static int av_encode(AVFormatContext **output_files, ist->decoding_needed = 1; break; default: - av_abort(); + abort(); break; } /* two pass mode */ @@ -2644,7 +2650,7 @@ static void opt_input_file(const char *filename) case CODEC_TYPE_UNKNOWN: break; default: - av_abort(); + abort(); } } @@ -2686,7 +2692,7 @@ static void check_audio_video_inputs(int *has_video_ptr, int *has_audio_ptr) case CODEC_TYPE_SUBTITLE: break; default: - av_abort(); + abort(); } } } @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <math.h> +#include <limits.h> #include "avformat.h" #include "swscale.h" #include "avstring.h" diff --git a/ffserver.c b/ffserver.c index 82cbc661dc..2c7065ba54 100644 --- a/ffserver.c +++ b/ffserver.c @@ -19,6 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" +#if HAVE_CLOSESOCKET != 1 +#define closesocket close +#endif +#include <string.h> +#include <stdlib.h> +#include <sys/poll.h> #include "avformat.h" #include <stdarg.h> @@ -1432,7 +1439,7 @@ static int http_parse_request(HTTPContext *c) } break; default: - av_abort(); + abort(); break; } @@ -1695,7 +1702,7 @@ static void compute_stats(HTTPContext *c) video_bit_rate += st->codec->bit_rate; break; default: - av_abort(); + abort(); } } url_fprintf(pb, "<TD align=center> %s <TD align=right> %d <TD align=right> %d <TD> %s %s <TD align=right> %d <TD> %s %s", @@ -1775,7 +1782,7 @@ static void compute_stats(HTTPContext *c) st->codec->qmin, st->codec->qmax, st->codec->time_base.den / st->codec->time_base.num); break; default: - av_abort(); + abort(); } url_fprintf(pb, "<tr><td align=right>%d<td>%s<td align=right>%d<td>%s<td>%s\n", i, type, st->codec->bit_rate/1000, codec ? codec->name : "", parameters); @@ -3302,7 +3309,7 @@ static int add_av_stream(FFStream *feed, AVStream *st) goto found; break; default: - av_abort(); + abort(); } } } @@ -3703,7 +3710,7 @@ static void add_codec(FFStream *stream, AVCodecContext *av) break; default: - av_abort(); + abort(); } st = av_mallocz(sizeof(AVStream)); |