diff options
Diffstat (limited to 'libdvbmpeg/remux.c')
| -rw-r--r-- | libdvbmpeg/remux.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/libdvbmpeg/remux.c b/libdvbmpeg/remux.c index e4607db..b37de3a 100644 --- a/libdvbmpeg/remux.c +++ b/libdvbmpeg/remux.c @@ -388,10 +388,9 @@ int refill_buffy(Remux *rem) while ( acount > MAX_PLENGTH && vcount > MAX_PLENGTH && count < 10){ - int neof; count++; init_pes(&pes); - if ((neof = read_pes(fin,&pes)) <= 0) return -1; + if (read_pes(fin,&pes) <= 0) return -1; switch(pes.stream_id){ case AUDIO_STREAM_S ... AUDIO_STREAM_E: rem->apes++; @@ -702,22 +701,6 @@ void init_remux(Remux *rem, int fin, int fout, int mult) rem->time_off = 0; } -uint32_t bytes2pts(int bytes, int rate) -{ - if (bytes < 0xFFFFFFFFUL/720000UL) - return (uint32_t)(bytes*720000UL/rate); - else - return (uint32_t)(bytes/rate*720000UL); -} - -long pts2bytes( uint32_t pts, int rate) -{ - if (pts < 0xEFFFFFFFUL/rate) - return (pts*rate/720000); - else - return (pts* (rate/720000)); -} - int write_audio_pes( Remux *rem, uint8_t *buf, int *alength) { int add; @@ -1088,12 +1071,6 @@ struct remux_s{ } REMUX; -void init_REMUX(REMUX *rem) -{ - rem->num_pbuf = 0; -} - - #define REPACK 2048 #define ABUF_SIZE REPACK*1024 |