eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-04 21:25:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

to be able to compile without HAVE_AV_CONFIG_H

Browse Source 
patch by Ronald S. Bultje: [rsbultje gmail com]
original thread: [FFmpeg-devel] ffmpeg.c/cmdutils.c compilation
date: 06/23/2007 03:15 AM

Originally committed as revision 9453 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje
2007-07-02 07:43:23 +00:00
committed by Benoit Fouet
parent d3b7406c6f
commit 0f4e816582
4 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ffmpeg.c
View File

@@ -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();
}
}
}