[FFmpeg-soc] [soc]: r2010 - in dvbmuxer: mpegpesenc.c mpegtsenc.c
bcoudurier
subversion at mplayerhq.hu
Tue Mar 11 15:44:32 CET 2008
Author: bcoudurier
Date: Tue Mar 11 15:44:31 2008
New Revision: 2010
Log:
cosmetics
Modified:
dvbmuxer/mpegpesenc.c
dvbmuxer/mpegtsenc.c
Modified: dvbmuxer/mpegpesenc.c
==============================================================================
--- dvbmuxer/mpegpesenc.c (original)
+++ dvbmuxer/mpegpesenc.c Tue Mar 11 15:44:31 2008
@@ -117,7 +117,7 @@ int ff_pes_get_nb_frames(AVFormatContext
* @return bytes written to PES stream.
*/
int ff_pes_muxer_write(AVFormatContext *ctx, int stream_index, uint8_t* pes_buffer,
- int64_t pts,int64_t dts, int id, int startcode,
+ int64_t pts,int64_t dts, int id, int startcode,
uint8_t* pes_content, int pes_content_len,
int header_len, int packet_size, int payload_size, int stuffing_size)
{
@@ -232,8 +232,8 @@ int ff_pes_find_beststream(AVFormatConte
retry:
for(i=0; i<ctx->nb_streams; i++){
AVStream *st = ctx->streams[i];
- PESStream*stream = st->priv_data;
- const int avail_data= av_fifo_size(&stream->fifo);
+ PESStream *stream = st->priv_data;
+ const int avail_data= av_fifo_size(&stream->fifo);
const int space= stream->max_buffer_size - stream->buffer_index;
int rel_space= 1024*space / stream->max_buffer_size;
PacketDesc *next_pkt= stream->premux_packet;
Modified: dvbmuxer/mpegtsenc.c
==============================================================================
--- dvbmuxer/mpegtsenc.c (original)
+++ dvbmuxer/mpegtsenc.c Tue Mar 11 15:44:31 2008
@@ -410,7 +410,6 @@ static int mpegts_write_header(AVFormatC
else
ts->packet_size = DEFAULT_PES_PAYLOAD_SIZE;
-
ts->pat.pid = PAT_PID;
ts->pat.cc = 0;
ts->pat.write_packet = section_write_packet;
@@ -538,8 +537,8 @@ static void mpegts_write_pes(AVFormatCon
int afc_len, stuffing_len;
int64_t pcr = -1; /* avoid warning */
int64_t delta_pcr;
-
int offset = 0;
+
is_start = 1;
while (payload_size > 0) {
retransmit_si_info(s);
@@ -647,7 +646,6 @@ static int flush_packet(AVFormatContext
packet_size = s->packet_size;
if (packet_size > 0) {
-
/* packet header size */
packet_size -= 6;
@@ -762,7 +760,6 @@ static int output_packet(AVFormatContext
es_size= flush_packet(ctx, best_i, AV_NOPTS_VALUE, AV_NOPTS_VALUE, trailer_size);
}
-
if(ff_pes_remove_decoded_packets(ctx, s->last_pcr) < 0)
return -1;
More information about the FFmpeg-soc
mailing list