- NUT-devel - lists.mplayerhq.hu

[nut]: r532 - src/trunk/libnut
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 15:36:36 2008 New Revision: 532 Log: Ignore doxygen directory. Modified: src/trunk/libnut/ (props changed)

1 0

[nut]: r531 - src/trunk/libnut/priv.h
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 15:35:13 2008 New Revision: 531 Log: spelling/wording Modified: src/trunk/libnut/priv.h Modified: src/trunk/libnut/priv.h ============================================================================== --- src/trunk/libnut/priv.h (original) +++ src/trunk/libnut/priv.h Fri Feb 1 15:35:13 2008 @@ -41,7 +41,7 @@ typedef struct { int is_mem; uint8_t * buf; uint8_t * buf_ptr; - int write_len; // memory allocated + int write_len; // allocated memory int read_len; // data in memory off_t file_pos; off_t filesize; @@ -53,7 +53,7 @@ typedef struct { int is_mem; uint8_t * buf; uint8_t * buf_ptr; - int write_len; // memory allocated + int write_len; // allocated memory off_t file_pos; nut_alloc_t * alloc; } output_buffer_t; @@ -89,7 +89,7 @@ typedef struct { uint64_t * pts; // each elem is stream_count items, +1 to real pts, 0 means there is no key uint64_t * eor; // same as pts, is the pts of last eor in syncpoint region _IF_ eor is set by syncpoint. int cached_pos; - syncpoint_linked_t * linked; // entires are entered in reverse order for speed, points to END of list + syncpoint_linked_t * linked; // entries are entered in reverse order for speed, points to END of list } syncpoint_list_t; typedef struct { @@ -107,7 +107,7 @@ typedef struct { } seek_state_t; typedef struct { - uint64_t last_key; // muxer.c, re-set to 0 on every keyframe + uint64_t last_key; // muxer.c, reset to 0 on every keyframe uint64_t last_pts; int64_t last_dts; int msb_pts_shift;

1 0

[nut]: r530 - src/trunk/nututils/nutmerge.h
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 15:34:36 2008 New Revision: 530 Log: Add multiple inclusion guards. Modified: src/trunk/nututils/nutmerge.h Modified: src/trunk/nututils/nutmerge.h ============================================================================== --- src/trunk/nututils/nutmerge.h (original) +++ src/trunk/nututils/nutmerge.h Fri Feb 1 15:34:36 2008 @@ -1,6 +1,9 @@ // (C) 2005-2006 Oded Shimon // This file is available under the MIT/X license, see COPYING +#ifndef NUTUTILS_NUTMERGE_H +#define NUTUTILS_NUTMERGE_H + #include <inttypes.h> #include <stdlib.h> #include <stdio.h> @@ -96,3 +99,5 @@ enum nutmerge_errors { err_vorbis_header, err_vorbis_packet, }; + +#endif // NUTUTILS_NUTMERGE_H

1 0

[nut]: r529 - in src/trunk/libnut: libnut.h priv.h
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 15:32:42 2008 New Revision: 529 Log: Use just LIBNUT as prefix for multiple inclusion guards. Also remove ugly trailing underscores from them. Modified: src/trunk/libnut/libnut.h src/trunk/libnut/priv.h Modified: src/trunk/libnut/libnut.h ============================================================================== --- src/trunk/libnut/libnut.h (original) +++ src/trunk/libnut/libnut.h Fri Feb 1 15:32:42 2008 @@ -1,8 +1,8 @@ // (C) 2005-2006 Oded Shimon // This file is available under the MIT/X license, see COPYING -#ifndef LIBNUT_NUT_H_ -#define LIBNUT_NUT_H_ +#ifndef LIBNUT_NUT_H +#define LIBNUT_NUT_H #include <stddef.h> #include <stdint.h> @@ -592,4 +592,4 @@ int nut_seek(nut_context_t * nut, double * After nut_seek, nut_read_next_packet should be called to get the next frame. */ -#endif // LIBNUT_NUT_H_ +#endif // LIBNUT_NUT_H Modified: src/trunk/libnut/priv.h ============================================================================== --- src/trunk/libnut/priv.h (original) +++ src/trunk/libnut/priv.h Fri Feb 1 15:32:42 2008 @@ -1,8 +1,8 @@ // (C) 2005-2006 Oded Shimon // This file is available under the MIT/X license, see COPYING -#ifndef LIBNUT_NUT_PRIV_H_ -#define LIBNUT_NUT_PRIV_H_ +#ifndef LIBNUT_PRIV_H +#define LIBNUT_PRIV_H //#define NDEBUG //#define TRACE @@ -235,4 +235,4 @@ static inline int gcd(int a, int b) { #define TO_TB(i) nut->tb[nut->sc[i].timebase_id] -#endif // LIBNUT_NUT_PRIV_H_ +#endif // LIBNUT_PRIV_H

1 0

[nut]: r528 - in src/trunk/nututils: demux_ogg.c framer_mp3.c framer_mpeg4.c framer_vorbis.c nutindex.c nutmerge.h nutparse.c
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 15:21:27 2008 New Revision: 528 Log: comment spelling/wording Modified: src/trunk/nututils/demux_ogg.c src/trunk/nututils/framer_mp3.c src/trunk/nututils/framer_mpeg4.c src/trunk/nututils/framer_vorbis.c src/trunk/nututils/nutindex.c src/trunk/nututils/nutmerge.h src/trunk/nututils/nutparse.c Modified: src/trunk/nututils/demux_ogg.c ============================================================================== --- src/trunk/nututils/demux_ogg.c (original) +++ src/trunk/nututils/demux_ogg.c Fri Feb 1 15:21:27 2008 @@ -12,7 +12,7 @@ typedef struct ogg_stream_s ogg_stream_t struct ogg_stream_s { int serial; - int leftover; // buffer for "next page" nonsense. always re-alloced + int leftover; // buffer for "next page" nonsense. always reallocated uint8_t * leftover_buf; }; @@ -21,7 +21,7 @@ struct demuxer_priv_s { ogg_stream_t * os; stream_t * s; int nstreams; - int stream_count; // when nutmerge_streams was handed to api... + int stream_count; // when nutmerge_streams was handed to the API ... }; static struct { enum nutmerge_codecs id; uint8_t * magic; int magic_len; } codecs[] = { @@ -77,7 +77,7 @@ static int read_page(demuxer_priv_t * og p.buf = malloc(len); p.p.len = len; p.p.stream = *stream; - p.p.flags = p.p.pts = p.p.next_pts = 0; // ogg sucks + p.p.flags = p.p.pts = p.p.next_pts = 0; // Ogg sucks memcpy(p.buf, os->leftover_buf, os->leftover); FREAD(ogg->in, len - os->leftover, p.buf + os->leftover); push_packet(&ogg->s[*stream], &p); Modified: src/trunk/nututils/framer_mp3.c ============================================================================== --- src/trunk/nututils/framer_mp3.c (original) +++ src/trunk/nututils/framer_mp3.c Fri Feb 1 15:21:27 2008 @@ -39,7 +39,7 @@ static int get_packet(framer_priv_t * mp if (layer==4) return err_mp3_bad_packet; if (freq==3) return err_mp3_bad_packet; - //>>19&0x3 + //>>19 & 0x3 if (newhead & (1<<20)) { // MPEG 1.0 (lsf==0) or MPEG 2.0 (lsf==1) lsf = (newhead & (1<<19)) ? 0 : 1; if (lsf) freq += 3; Modified: src/trunk/nututils/framer_mpeg4.c ============================================================================== --- src/trunk/nututils/framer_mpeg4.c (original) +++ src/trunk/nututils/framer_mpeg4.c Fri Feb 1 15:21:27 2008 @@ -37,15 +37,15 @@ static int get_packet(framer_priv_t * mc if (!(p->p.flags & NUT_FLAG_KEY) ^ (type != 0)) printf("Error detected stream %d frame %d\n", p->p.stream, (int)p->p.pts); p->p.flags |= (type == 0 ? NUT_FLAG_KEY : 0); - if (type == 2) { p->p.pts--; return 0; } // B frame, simple + if (type == 2) { p->p.pts--; return 0; } // B-frame, simple if (type == 3) printf("S-Frame %d\n", (int)p->p.pts); - // I, P or S, needs forward B frame check + // I, P or S, needs forward B-frame check while ((err = peek_stream_packet(mc->stream, &tmp_p, n++)) != -1) { if (err) return err; CHECK(find_frame_type(tmp_p.p.len, tmp_p.buf, &type)); - if (type != 2) break; // not b frame, we're done. + if (type != 2) break; // Not a B-frame, we're done. p->p.pts++; } Modified: src/trunk/nututils/framer_vorbis.c ============================================================================== --- src/trunk/nututils/framer_vorbis.c (original) +++ src/trunk/nututils/framer_vorbis.c Fri Feb 1 15:21:27 2008 @@ -73,7 +73,7 @@ static int setup_headers(framer_priv_t * uint8_t * p; packet_t pd[3]; - // need first 3 packets - TODO - support work directly from good codec_specific instead of ogg crap + // need first 3 packets - TODO - support working directly from good codec_specific instead of Ogg crap CHECK(get_stream_packet(vc->stream, &pd[0])); pd_read++; CHECK(get_stream_packet(vc->stream, &pd[1])); pd_read++; CHECK(get_stream_packet(vc->stream, &pd[2])); pd_read++; @@ -309,7 +309,7 @@ static int get_packet(framer_priv_t * vc if (vc->pts == -1) vc->pts = -MIN(prevbs, mybs)/2; // negative pts for first frame vc->pts += MIN(prevbs, mybs)/2; // overlapped with prev - vc->pts += (mybs - prevbs)/4; // self contained + vc->pts += (mybs - prevbs)/4; // self-contained vc->pts += (mybs - nextbs)/4; p->p.pts = last_pts; Modified: src/trunk/nututils/nutindex.c ============================================================================== --- src/trunk/nututils/nutindex.c (original) +++ src/trunk/nututils/nutindex.c Fri Feb 1 15:21:27 2008 @@ -40,7 +40,7 @@ typedef struct { int is_mem; uint8_t * buf; uint8_t * buf_ptr; - int write_len; // memory allocated + int write_len; // allocated memory off_t file_pos; FILE * out; } output_buffer_t; @@ -130,7 +130,7 @@ typedef struct { FILE * in; uint8_t * buf; uint8_t * buf_ptr; - int write_len; // memory allocated + int write_len; // allocated memory int read_len; // data in memory off_t file_pos; off_t filesize; @@ -313,7 +313,7 @@ static int find_copy_index(input_buffer_ forward_ptr += new_idx_len-idx_len; - idx_len = (in->filesize - 12) - bctello(in); // from where we are, until the index_ptr and checksum, copy everything + idx_len = (in->filesize - 12) - bctello(in); // copy everything from where we are until the index_ptr and checksum if (get_data(in, idx_len, out->buf_ptr)) return 1; out->buf_ptr += idx_len; @@ -333,7 +333,7 @@ int main(int argc, char * argv[]) { fprintf(stderr, "%s <input-nut-file> <output-nut-file>\n", argv[0]); return 1; } - printf("Note! This program produces less error resiliant files by moving the main headers!\n"); + printf("Note! This program produces less error resilient files by moving the main headers!\n"); in = new_input_buffer(&iin, fin); out = new_output_buffer(&oout, fout); Modified: src/trunk/nututils/nutmerge.h ============================================================================== --- src/trunk/nututils/nutmerge.h (original) +++ src/trunk/nututils/nutmerge.h Fri Feb 1 15:21:27 2008 @@ -25,7 +25,7 @@ enum nutmerge_codecs { typedef struct { nut_packet_t p; - uint8_t * buf; // the demuxer mallocs this, nutmerge (or framer) evantually frees it + uint8_t * buf; // the demuxer mallocs this, nutmerge (or framer) eventually frees it } packet_t; typedef struct { Modified: src/trunk/nututils/nutparse.c ============================================================================== --- src/trunk/nututils/nutparse.c (original) +++ src/trunk/nututils/nutparse.c Fri Feb 1 15:21:27 2008 @@ -774,7 +774,7 @@ static void parse_frame(int frame_type) } printf(" pts: %"PRIi64" (%.3lf s)", streams[stream_id].last_pts, time_in_s(streams[stream_id].last_pts, streams[stream_id].time_base_id)); - /* TODO: check pts monotoneness and other pts/dts constraints */ + /* TODO: check pts monotonicity and other pts/dts constraints */ printf(" data_size: %"PRIu64"\n", data_size_msb * frame_types[frame_type].data_size_mul + frame_types[frame_type].data_size_lsb); if ((frame_flags & (FLAG_KEY | FLAG_EOR)) == FLAG_EOR) error("eor frames must be key frames");

1 0

[nut]: r527 - in src/trunk/libnut: libnut.h priv.h
by ods15 01 Feb '08

01 Feb '08

Author: ods15 Date: Fri Feb 1 15:20:19 2008 New Revision: 527 Log: Better inclusion guards, legal C Modified: src/trunk/libnut/libnut.h src/trunk/libnut/priv.h Modified: src/trunk/libnut/libnut.h ============================================================================== --- src/trunk/libnut/libnut.h (original) +++ src/trunk/libnut/libnut.h Fri Feb 1 15:20:19 2008 @@ -1,8 +1,8 @@ // (C) 2005-2006 Oded Shimon // This file is available under the MIT/X license, see COPYING -#ifndef _NUT_H -#define _NUT_H +#ifndef LIBNUT_NUT_H_ +#define LIBNUT_NUT_H_ #include <stddef.h> #include <stdint.h> @@ -592,4 +592,4 @@ int nut_seek(nut_context_t * nut, double * After nut_seek, nut_read_next_packet should be called to get the next frame. */ -#endif // _NUT_H +#endif // LIBNUT_NUT_H_ Modified: src/trunk/libnut/priv.h ============================================================================== --- src/trunk/libnut/priv.h (original) +++ src/trunk/libnut/priv.h Fri Feb 1 15:20:19 2008 @@ -1,8 +1,8 @@ // (C) 2005-2006 Oded Shimon // This file is available under the MIT/X license, see COPYING -#ifndef _NUT_PRIV_H -#define _NUT_PRIV_H +#ifndef LIBNUT_NUT_PRIV_H_ +#define LIBNUT_NUT_PRIV_H_ //#define NDEBUG //#define TRACE @@ -235,4 +235,4 @@ static inline int gcd(int a, int b) { #define TO_TB(i) nut->tb[nut->sc[i].timebase_id] -#endif // _NUT_PRIV_H +#endif // LIBNUT_NUT_PRIV_H_

1 0

[nut]: r526 - src/trunk/libnut/demuxer.c
by ods15 01 Feb '08

01 Feb '08

Author: ods15 Date: Fri Feb 1 15:18:34 2008 New Revision: 526 Log: some more comment fixes Modified: src/trunk/libnut/demuxer.c Modified: src/trunk/libnut/demuxer.c ============================================================================== --- src/trunk/libnut/demuxer.c (original) +++ src/trunk/libnut/demuxer.c Fri Feb 1 15:18:34 2008 @@ -1285,7 +1285,7 @@ static int linear_search_seek(nut_contex break; } } - if (stopper_syncpoint > bctello(nut->i)) stopper_syncpoint = 0; // don't premature + if (stopper_syncpoint > bctello(nut->i)) stopper_syncpoint = 0; // do not load stopper_syncpoint position before it is actually reached } #define CHECK_break(expr) { if ((err = (expr))) { if (end && err != NUT_ERR_EAGAIN) break; else goto err_out; } } @@ -1495,7 +1495,7 @@ int nut_seek(nut_context_t * nut, double if (start) { // "unsuccessful" seek needs no linear search if (!(flags & 2)) { // regular seek CHECK(linear_search_seek(nut, backwards, start, end, stopper.pos ? &stopper : NULL)); - } else { // seek forwards, find keyframe + } else { // forward seek, find keyframe CHECK(linear_search_seek(nut, backwards, end, 0, NULL)); } }

1 0

[nut]: r525 - in src/trunk/libnut: demuxer.c framecode.c muxer.c reorder.c
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 14:59:44 2008 New Revision: 525 Log: comment spelling/wording Modified: src/trunk/libnut/demuxer.c src/trunk/libnut/framecode.c src/trunk/libnut/muxer.c src/trunk/libnut/reorder.c Modified: src/trunk/libnut/demuxer.c ============================================================================== --- src/trunk/libnut/demuxer.c (original) +++ src/trunk/libnut/demuxer.c Fri Feb 1 14:59:44 2008 @@ -803,7 +803,7 @@ static int find_main_headers(nut_context if ((err = get_header(nut->i, NULL)) == NUT_ERR_EAGAIN) goto err_out; if (err) { tmp = err = 0; break; } // bad - // EOF is a legal error here - when reading the last headers in file + // EOF is a legal error here - when reading the last headers in the file if ((err = get_bytes(nut->i, 8, &tmp)) == NUT_ERR_EOF) { err = 0; tmp = SYNCPOINT_STARTCODE; } CHECK(err); // if get_bytes returns EAGAIN or a memory error, check for that } while (tmp != SYNCPOINT_STARTCODE); @@ -832,7 +832,7 @@ static int find_main_headers(nut_context } } seek_buf(nut->i, 1 << ++nut->seek_status, SEEK_SET); - // evantually we'll hit EOF and give up + // eventually we'll hit EOF and give up return find_main_headers(nut); err_out: if (err == NUT_ERR_EOF && !nut->last_syncpoint && nut->seek_status) { @@ -888,7 +888,7 @@ retry: return 0; } - if (read < nut->max_distance) return buf_eof(nut->i); // too little read + if (read < nut->max_distance) return buf_eof(nut->i); // too little was read if (backwards) { nut->i->buf_ptr = nut->i->buf; @@ -919,7 +919,7 @@ static int smart_find_syncpoint(nut_cont for (i = 0; i < sl->len; i++) if (sl->s[i].pos+15 > pos) break; ERROR(i == sl->len || (i && !sl->s[i-1].seen_next), -1); - // trust the caller if it gave more percise syncpoint location + // trust the caller if it gave more precise syncpoint location if (ABS(pos - sl->s[i].pos) > 15) seek_buf(nut->i, sl->s[i].pos, SEEK_SET); } fss->i = i + 1; @@ -994,7 +994,7 @@ int nut_read_next_packet(nut_context_t * if (nut->seek_status) { // in error mode! syncpoint_t s; CHECK(smart_find_syncpoint(nut, &s, 0, 0)); - nut->i->buf_ptr = get_buf(nut->i, s.pos); // go back to begginning of syncpoint + nut->i->buf_ptr = get_buf(nut->i, s.pos); // go back to beginning of syncpoint flush_buf(nut->i); clear_dts_cache(nut); nut->last_syncpoint = 0; @@ -1047,7 +1047,7 @@ static int get_headers(nut_context_t * n } else { CHECK(get_header(nut->i, NULL)); } - // EOF is a legal error here - when reading the last headers in file + // EOF is a legal error here - when reading the last headers in the file if ((err = get_bytes(nut->i, 8, &tmp)) == NUT_ERR_EOF) { tmp = err = 0; break; } CHECK(err); // it's just barely possible for get_bytes to return a memory error, check for that } @@ -1103,7 +1103,7 @@ int nut_read_headers(nut_context_t * nut // step 4 - find the first syncpoint in file if (nut->last_headers > 1024 && !nut->seek_status && nut->i->isc.seek) { - // the headers weren't found in begginning of file + // the headers weren't found in the beginning of the file assert(nut->i->isc.seek); seek_buf(nut->i, 0, SEEK_SET); nut->seek_status = 1; @@ -1167,7 +1167,7 @@ static int binary_search_syncpoint(nut_c // find last syncpoint if it's not already found if (!sl->s[sl->len-1].seen_next) { - // searching bakwards from EOF + // searching backwards from EOF if (!nut->seek_status) seek_buf(nut->i, -nut->max_distance, SEEK_END); nut->seek_status = 1; CHECK(find_syncpoint(nut, &s, 1, 0)); @@ -1267,7 +1267,7 @@ static int linear_search_seek(nut_contex syncpoint_t s; if (!nut->seek_status) seek_buf(nut->i, start, SEEK_SET); nut->seek_status = 1; - // find closest syncpoint by linear search, SHOULD be one pointed by back_ptr... + // find closest syncpoint by linear search, SHOULD be one pointed to by back_ptr... CHECK(smart_find_syncpoint(nut, &s, !!end, 0)); clear_dts_cache(nut); nut->last_syncpoint = 0; // last_key is invalid @@ -1334,7 +1334,7 @@ static int linear_search_seek(nut_contex } else if (stopper && pd.flags&NUT_FLAG_KEY) { off_t back_ptr = stopper->pos - stopper->back_ptr; TO_PTS(stopper, stopper->pts) - // only relavent if pts is smaller than stopper, and we passed stopper's back_ptr + // only relevant if pts is smaller than stopper, and we passed stopper's back_ptr if (compare_ts(pd.pts, TO_TB(pd.stream), stopper_p, nut->tb[stopper_t]) < 0 && buf_before >= back_ptr) { if (!stopper_syncpoint) nut->sc[pd.stream].state.good_key = 1; else if (nut->sc[pd.stream].state.good_key) { @@ -1463,7 +1463,7 @@ int nut_seek(nut_context_t * nut, double uint64_t tmp; if (!nut->sc[j].state.active) continue; tmp = sl->pts[i * nut->stream_count + j]; - if (tmp--) { // -- because all pts array is off-by-one. zero indicate no keyframe. + if (tmp--) { // -- because all pts array is off-by-one. Zero indicates no keyframe. if (tmp > nut->sc[j].state.pts) { if (!last_sync) last_sync = i; } else sync[j] = (i-1); } @@ -1495,7 +1495,7 @@ int nut_seek(nut_context_t * nut, double if (start) { // "unsuccessful" seek needs no linear search if (!(flags & 2)) { // regular seek CHECK(linear_search_seek(nut, backwards, start, end, stopper.pos ? &stopper : NULL)); - } else { // forwards seek, find keyframe + } else { // seek forwards, find keyframe CHECK(linear_search_seek(nut, backwards, end, 0, NULL)); } } @@ -1612,7 +1612,7 @@ const char * nut_error(int error) { case NUT_ERR_NO_HEADERS: return "No headers found!"; case NUT_ERR_NOT_SEEKABLE: return "Cannot seek to that position."; case NUT_ERR_OUT_OF_ORDER: return "out of order dts"; - case NUT_ERR_MAX_PTS_DISTANCE: return "Pts difference higher than max_pts_distance."; + case NUT_ERR_MAX_PTS_DISTANCE: return "pts difference higher than max_pts_distance."; case NUT_ERR_BAD_STREAM_ORDER: return "Stream headers are stored in wrong order."; case NUT_ERR_NOSTREAM_STARTCODE: return "Expected stream startcode not found."; case NUT_ERR_BAD_EOF: return "Invalid forward_ptr!"; Modified: src/trunk/libnut/framecode.c ============================================================================== --- src/trunk/libnut/framecode.c (original) +++ src/trunk/libnut/framecode.c Fri Feb 1 14:59:44 2008 @@ -83,7 +83,7 @@ void nut_framecode_generate(const nut_st for (i = 0; i < stream_count; i++) if (consume[i]) tot_con++; - if (tot_con) tot_con = (254 - (n+m))/tot_con; // 256 - 'N' - 0xFF invalids + if (tot_con) tot_con = (254 - (n+m))/tot_con; // 256 - 'N' - 0xFF invalid if (tot_con) for (i = 0; i < stream_count; i++) { int al = tot_con; switch (consume[i]) { Modified: src/trunk/libnut/muxer.c ============================================================================== --- src/trunk/libnut/muxer.c (original) +++ src/trunk/libnut/muxer.c Fri Feb 1 14:59:44 2008 @@ -313,7 +313,7 @@ static void put_syncpoint(nut_context_t if (n) { i--; break; } } back_ptr = (nut->last_syncpoint - s->s[i].pos) / 16; - if (!nut->mopts.write_index) { // clear some syncpoit cache if possible + if (!nut->mopts.write_index) { // clear some syncpoint cache if possible s->len -= i; memmove(s->s, s->s + i, s->len * sizeof(syncpoint_t)); memmove(s->pts, s->pts + i * nut->stream_count, s->len * nut->stream_count * sizeof(uint64_t)); Modified: src/trunk/libnut/reorder.c ============================================================================== --- src/trunk/libnut/reorder.c (original) +++ src/trunk/libnut/reorder.c Fri Feb 1 14:59:44 2008 @@ -46,7 +46,7 @@ static void flushcheck_frames(nut_contex } } // MN rule, (i < j) && (i.dts <= j.pts) - // actually, strict DTS. + // actually, strict dts if (min == -1 || nut->sc[i].packets[0].dts <= min) { for (j = 1; j < nut->sc[i].num_packets; j++) { if (min != -1 && nut->sc[i].packets[j].dts > min) break;

1 0

[nut]: r524 - src/trunk/libnut/libnut.h
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 14:56:02 2008 New Revision: 524 Log: Update URLs. Modified: src/trunk/libnut/libnut.h Modified: src/trunk/libnut/libnut.h ============================================================================== --- src/trunk/libnut/libnut.h (original) +++ src/trunk/libnut/libnut.h Fri Feb 1 14:56:02 2008 @@ -242,12 +242,12 @@ int nut_seek(nut_context_t * nut, double * * Reference implementation for NUT open container format. * - * libnut source code can be downloaded from svn://svn.mplayerhq.hu/nut + * libnut source code is at svn://svn.mplayerhq.hu/nut/src/libnut/ * * Copyright of this library is MIT/X license. For more details, see * \ref License. * - * For more information on the format, please visit http://www.nut.hu + * For more information on the format, please visit http://www.nut-container.org/ */ /*! \page License

1 0

[nut]: r523 - src/trunk/README
by diego 01 Feb '08

01 Feb '08

Author: diego Date: Fri Feb 1 14:52:02 2008 New Revision: 523 Log: spelling/wording Modified: src/trunk/README Modified: src/trunk/README ============================================================================== --- src/trunk/README (original) +++ src/trunk/README Fri Feb 1 14:52:02 2008 @@ -4,12 +4,12 @@ make install to use: -./nutmerge bla.avi bla.nut # only mpeg-4 with mp3 -./nutmerge bla.ogg bla.nut # only vorbis +./nutmerge bla.avi bla.nut # only MPEG-4 with MP3 +./nutmerge bla.ogg bla.nut # only Vorbis to play with mplayer: -./configure # libnut should be auto detected after make install here +./configure # libnut should be autodetected after make install make ./mplayer bla.nut @@ -20,7 +20,7 @@ make ./ffplay bla.nut -to copy index to begginning of file: +to copy index to beginning of file: ./nutindex bla.nut new.nut

1 0