Fix annoying warning in OSX build

This commit is contained in:
cfsmp3 2015-01-18 22:56:26 +01:00
parent 9f00cec9c0
commit dc9f6d250a
5 changed files with 8 additions and 7 deletions

View File

@ -427,7 +427,8 @@ static int sequence_header(struct lib_ccx_ctx *ctx, struct bitstream *esstream)
// whole sequence info.
if (vert_size >= 288 && vert_size <= 1088 &&
hor_size >= 352 && hor_size <= 1920 &&
hor_size / vert_size >= 352/576 && hor_size / vert_size <= 2 &&
(hor_size*100) / vert_size >= (352*100)/576 && // The weird *100 is to avoid using floats
hor_size / vert_size <= 2 &&
frame_rate>0 && frame_rate<9 &&
aspect_ratio>0 && aspect_ratio<5)
{

View File

@ -246,7 +246,7 @@ void buffered_seek (struct lib_ccx_ctx *ctx, int offset)
if (filebuffer_pos<0)
{
// We got into the start buffer (hopefully)
if (ctx->startbytes_pos+filebuffer_pos < 0)
if ((filebuffer_pos+ctx->startbytes_pos) < 0)
{
fatal (CCX_COMMON_EXIT_BUG_BUG, "PANIC: Attempt to seek before buffer start, this is a bug!");
}

View File

@ -129,7 +129,7 @@ int parsedelay (struct ccx_s_options *opt, char *par)
c++;
}
if (sign)
opt->subs_delay =- opt->subs_delay;
opt->subs_delay = -opt->subs_delay;
return 0;
}

View File

@ -503,7 +503,7 @@ void process_page(struct lib_ccx_ctx *ctx, teletext_page_t *page) {
page_buffer_add_string("<br/>");
break;
default:
page_buffer_add_string(encoded_crlf);
page_buffer_add_string((const char *) encoded_crlf);
}
}
@ -656,8 +656,8 @@ void process_page(struct lib_ccx_ctx *ctx, teletext_page_t *page) {
}
break;
default: // Yes, this means everything else is .srt for now
page_buffer_add_string (encoded_crlf);
page_buffer_add_string (encoded_crlf);
page_buffer_add_string ((const char *) encoded_crlf);
page_buffer_add_string((const char *) encoded_crlf);
if (ctx->wbout1.fh!=-1) {
fdprintf(ctx->wbout1.fh,"%"PRIu32"%s%s --> %s%s", tlt_frames_produced, encoded_crlf, timecode_show, timecode_hide, encoded_crlf);
fdprintf(ctx->wbout1.fh, "%s",page_buffer_cur);

View File

@ -22,7 +22,7 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
* $Id: dirent.h,v 1.20 2014/03/19 17:52:23 tronkko Exp $
* $Id: dirent.h,v 1.1 2015/01/16 07:40:15 cfsmp3 Exp $
*/
#ifndef DIRENT_H
#define DIRENT_H