[FFmpeg-soc] [soc]: r5162 - in concat: ffmpeg.c.diff libavformat/concat.c libavformat/m3u.c libavformat/pls.c libavformat/xspf.c
gkovacs
subversion at mplayerhq.hu
Mon Aug 17 16:25:05 CEST 2009
Author: gkovacs
Date: Mon Aug 17 16:25:05 2009
New Revision: 5162
Log:
removed trailing NULL assignments
Modified:
concat/ffmpeg.c.diff
concat/libavformat/concat.c
concat/libavformat/m3u.c
concat/libavformat/pls.c
concat/libavformat/xspf.c
Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff Mon Aug 17 13:01:16 2009 (r5161)
+++ concat/ffmpeg.c.diff Mon Aug 17 16:25:05 2009 (r5162)
@@ -1,5 +1,5 @@
diff --git a/ffmpeg.c b/ffmpeg.c
-index e5512c2..4b1fbdc 100644
+index 2686e1d..4b1fbdc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -40,6 +40,7 @@
@@ -10,7 +10,18 @@ index e5512c2..4b1fbdc 100644
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
-@@ -1232,7 +1233,8 @@ static void print_report(AVFormatContext **output_files,
+@@ -828,10 +829,6 @@ static void do_subtitle_out(AVFormatContext *s,
+ sub->pts = av_rescale_q(pts, ist->st->time_base, AV_TIME_BASE_Q);
+ subtitle_out_size = avcodec_encode_subtitle(enc, subtitle_out,
+ subtitle_out_max_size, sub);
+- if (subtitle_out_size < 0) {
+- fprintf(stderr, "Subtitle encoding failed\n");
+- av_exit(1);
+- }
+
+ av_init_packet(&pkt);
+ pkt.stream_index = ost->index;
+@@ -1236,7 +1233,8 @@ static void print_report(AVFormatContext **output_files,
/* pkt = NULL means EOF (needed to flush decoder buffers) */
static int output_packet(AVInputStream *ist, int ist_index,
AVOutputStream **ost_table, int nb_ostreams,
@@ -20,7 +31,7 @@ index e5512c2..4b1fbdc 100644
{
AVFormatContext *os;
AVOutputStream *ost;
-@@ -1244,8 +1246,15 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1248,8 +1246,15 @@ static int output_packet(AVInputStream *ist, int ist_index,
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -36,7 +47,7 @@ index e5512c2..4b1fbdc 100644
if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts;
-@@ -1287,6 +1296,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1291,6 +1296,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
endianness as CPU */
ret = avcodec_decode_audio3(ist->st->codec, samples, &data_size,
&avpkt);
@@ -44,7 +55,7 @@ index e5512c2..4b1fbdc 100644
if (ret < 0)
goto fail_decode;
avpkt.data += ret;
-@@ -1393,7 +1403,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1397,7 +1403,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
int frame_size;
ost = ost_table[i];
@@ -53,7 +64,7 @@ index e5512c2..4b1fbdc 100644
os = output_files[ost->file_index];
/* set the input output pts pairs */
-@@ -2145,6 +2155,8 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2149,6 +2155,8 @@ static int av_encode(AVFormatContext **output_files,
AVPacket pkt;
double ipts_min;
double opts_min;
@@ -62,7 +73,7 @@ index e5512c2..4b1fbdc 100644
redo:
ipts_min= 1e100;
-@@ -2230,12 +2242,44 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2234,12 +2242,44 @@ static int av_encode(AVFormatContext **output_files,
if (do_pkt_dump) {
av_pkt_dump_log(NULL, AV_LOG_DEBUG, &pkt, do_hex_dump);
}
@@ -108,7 +119,7 @@ index e5512c2..4b1fbdc 100644
if (ist->discard)
goto discard_packet;
-@@ -2267,8 +2311,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2271,8 +2311,7 @@ static int av_encode(AVFormatContext **output_files,
}
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
@@ -118,7 +129,7 @@ index e5512c2..4b1fbdc 100644
if (verbose >= 0)
fprintf(stderr, "Error while decoding stream #%d.%d\n",
ist->file_index, ist->index);
-@@ -2289,7 +2332,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2293,7 +2332,7 @@ static int av_encode(AVFormatContext **output_files,
for(i=0;i<nb_istreams;i++) {
ist = ist_table[i];
if (ist->decoding_needed) {
Modified: concat/libavformat/concat.c
==============================================================================
--- concat/libavformat/concat.c Mon Aug 17 13:01:16 2009 (r5161)
+++ concat/libavformat/concat.c Mon Aug 17 16:25:05 2009 (r5162)
@@ -90,7 +90,4 @@ AVInputFormat concat_demuxer = {
ff_concatgen_read_play,
ff_concatgen_read_pause,
(const AVCodecTag* const []){codec_concat_tags, 0},
- NULL, //concat_read_seek2
- NULL, //metadata_conv
- NULL, //next
};
Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c Mon Aug 17 13:01:16 2009 (r5161)
+++ concat/libavformat/m3u.c Mon Aug 17 16:25:05 2009 (r5162)
@@ -104,7 +104,4 @@ AVInputFormat m3u_demuxer = {
ff_concatgen_read_play,
ff_concatgen_read_pause,
(const AVCodecTag* const []){codec_m3u_tags, 0},
- NULL, //m3u_read_seek2
- NULL, //metadata_conv
- NULL, //next
};
Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c Mon Aug 17 13:01:16 2009 (r5161)
+++ concat/libavformat/pls.c Mon Aug 17 16:25:05 2009 (r5162)
@@ -131,7 +131,4 @@ AVInputFormat pls_demuxer = {
ff_concatgen_read_play,
ff_concatgen_read_pause,
(const AVCodecTag* const []){codec_pls_tags, 0},
- NULL, //pls_read_seek2
- NULL, //metadata_conv
- NULL, //next
};
Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c Mon Aug 17 13:01:16 2009 (r5161)
+++ concat/libavformat/xspf.c Mon Aug 17 16:25:05 2009 (r5162)
@@ -132,7 +132,4 @@ AVInputFormat xspf_demuxer = {
ff_concatgen_read_play,
ff_concatgen_read_pause,
(const AVCodecTag* const []){codec_xspf_tags, 0},
- NULL, //xspf_read_seek2
- NULL, //metadata_conv
- NULL, //next
};
More information about the FFmpeg-soc
mailing list