diff --git a/doc/general.texi b/doc/general.texi index 2fbcbbf20a..876a0f3397 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -13,7 +13,8 @@ FFmpeg can be hooked up with a number of external libraries to add support for more formats. None of them are used by default, their use has to be -explicitly requested by passing the appropriate flags to @file{./configure}. +explicitly requested by passing the appropriate flags to +@command{./configure}. @section OpenJPEG diff --git a/doc/platform.texi b/doc/platform.texi index d0db8aed62..dcbb0f6437 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -27,11 +27,11 @@ to configure. @section BSD BSD make will not build FFmpeg, you need to install and use GNU Make -(@file{gmake}). +(@command{gmake}). @section (Open)Solaris -GNU Make is required to build FFmpeg, so you have to invoke (@file{gmake}), +GNU Make is required to build FFmpeg, so you have to invoke (@command{gmake}), standard Solaris Make will not work. When building with a non-c99 front-end (gcc, generic suncc) add either @code{--extra-libs=/usr/lib/values-xpg6.o} or @code{--extra-libs=/usr/lib/64/values-xpg6.o} to the configure options @@ -272,7 +272,7 @@ To create import libraries that work with the @code{/OPT:REF} option @enumerate -@item Open @file{Visual Studio 2005 Command Prompt}. +@item Open @emph{Visual Studio 2005 Command Prompt}. Alternatively, in a normal command line prompt, call @file{vcvars32.bat} which sets up the environment variables for the Visual C++ tools @@ -282,7 +282,7 @@ which sets up the environment variables for the Visual C++ tools @item Enter the @file{bin} directory where the created LIB and DLL files are stored. -@item Generate new import libraries with @file{lib.exe}: +@item Generate new import libraries with @command{lib.exe}: @example lib /machine:i386 /def:..\lib\foo-version.def /out:foo.lib diff --git a/ffmpeg.c b/ffmpeg.c index 6501bd3530..5239132305 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2028,8 +2028,10 @@ static int poll_filters(void) //if (ost->source_index >= 0) // *filtered_frame= *input_streams[ost->source_index]->decoded_frame; //for me_threshold - if (of->start_time && filtered_frame->pts < of->start_time) - return 0; + if (of->start_time && filtered_frame->pts < of->start_time) { + avfilter_unref_buffer(picref); + continue; + } switch (ost->filter->filter->inputs[0]->type) { case AVMEDIA_TYPE_VIDEO: diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index c7db91de9e..345b07ca5d 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -895,9 +895,10 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) fname = path + 10; memcpy(rt->app, "ondemand", 9); } else { - char *p = strchr(path + 1, '/'); + char *next = *path ? path + 1 : path; + char *p = strchr(next, '/'); if (!p) { - fname = path + 1; + fname = next; rt->app[0] = '\0'; } else { char *c = strchr(p + 1, ':'); diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak index ed2ce12c0e..6db61bd074 100644 --- a/tests/fate/ac3.mak +++ b/tests/fate/ac3.mak @@ -35,6 +35,7 @@ fate-ac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-ac3-encode: CMP_SHIFT = -1024 fate-ac3-encode: CMP_TARGET = 399.62 fate-ac3-encode: SIZE_TOLERANCE = 488 +fate-ac3-encode: FUZZ = 3 FATE_AC3 += fate-eac3-encode fate-eac3-encode: CMD = enc_dec_pcm eac3 wav s16le $(REF) -c:a eac3 -b:a 128k @@ -43,6 +44,7 @@ fate-eac3-encode: REF = $(SAMPLES)/audio-reference/luckynight_2ch_44kHz_s16.wav fate-eac3-encode: CMP_SHIFT = -1024 fate-eac3-encode: CMP_TARGET = 514.02 fate-eac3-encode: SIZE_TOLERANCE = 488 +fate-eac3-encode: FUZZ = 3 FATE_AVCONV += $(FATE_AC3) fate-ac3: $(FATE_AC3) diff --git a/tests/fate/vorbis.mak b/tests/fate/vorbis.mak index 25a5d89796..578d7c4871 100644 --- a/tests/fate/vorbis.mak +++ b/tests/fate/vorbis.mak @@ -49,6 +49,7 @@ fate-vorbis-12: REF = $(SAMPLES)/vorbis/mono_small.pcm FATE_VORBIS += fate-vorbis-13 fate-vorbis-13: CMD = pcm -i $(SAMPLES)/vorbis/moog_small.ogg fate-vorbis-13: REF = $(SAMPLES)/vorbis/moog_small.pcm +fate-vorbis-13: FUZZ = 2 FATE_VORBIS += fate-vorbis-14 fate-vorbis-14: CMD = pcm -i $(SAMPLES)/vorbis/rc1-test_small.ogg