Mercurial > mplayer.hg
diff libmpdemux/muxer.c @ 17065:cf6bfdf41143
Clean up some muxer messages, patch by Corey Hickey bugfood-ml AT -fatooh/org- , small fixes by me
author | reynaldo |
---|---|
date | Tue, 29 Nov 2005 22:04:57 +0000 |
parents | dd5be8f8d16d |
children | 60189cd9bbc8 |
line wrap: on
line diff
--- a/libmpdemux/muxer.c Tue Nov 29 19:53:05 2005 +0000 +++ b/libmpdemux/muxer.c Tue Nov 29 22:04:57 2005 +0000 @@ -62,7 +62,7 @@ tmp = realloc(s->muxer->muxbuf, (num+1) * sizeof(muxbuf_t)); if(!tmp) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot reallocate memory!\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, MSGTR_MuxbufReallocErr); return; } s->muxer->muxbuf = tmp; @@ -75,7 +75,7 @@ buf->flags = flags; buf->buffer = malloc(len * sizeof (unsigned char)); if (!buf->buffer) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot allocate memory!\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, MSGTR_MuxbufMallocErr); return; } memcpy(buf->buffer, s->buffer, buf->len); @@ -91,11 +91,10 @@ if (s->muxer->muxbuf_skip_buffer) { muxbuf_t *tmp_buf = malloc(sizeof(muxbuf_t)); if (!tmp_buf) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "Muxer frame buffer cannot allocate memory!\n"); + mp_msg(MSGT_MUXER, MSGL_FATAL, MSGTR_MuxbufMallocErr); return; } - mp_msg(MSGT_MUXER, MSGL_V, "Muxer frame buffer sending %d frame(s) to muxer.\n", - s->muxer->muxbuf_num); + mp_msg(MSGT_MUXER, MSGL_V, MSGTR_MuxbufSending, s->muxer->muxbuf_num); /* fix parameters for all streams */ for (num = 0; s->muxer->streams[num]; ++num) { @@ -105,7 +104,6 @@ } /* write header */ - mp_msg(MSGT_MUXER, MSGL_INFO, MSGTR_WritingAVIHeader); if (s->muxer->cont_write_header) muxer_write_header(s->muxer); @@ -139,7 +137,7 @@ if(s->h.dwSampleSize){ // CBR s->h.dwLength+=len/s->h.dwSampleSize; - if(len%s->h.dwSampleSize) mp_msg(MSGT_MUXER, MSGL_WARN, "Warning! len isn't divisable by samplesize!\n"); + if(len%s->h.dwSampleSize) mp_msg(MSGT_MUXER, MSGL_WARN, MSGTR_WarningLenIsntDivisible); } else { // VBR s->h.dwLength++;