[FFmpeg-soc] [soc]: r5096 - in concat: Changelog.diff ffmpeg.c.diff ffplay.c.diff libavcodec/utils.c.diff libavformat/Makefile.diff libavformat/allformats.c.diff libavformat/utils.c.diff upstreamrev
gkovacs
subversion at mplayerhq.hu
Thu Aug 13 22:53:40 CEST 2009
Author: gkovacs
Date: Thu Aug 13 22:53:40 2009
New Revision: 5096
Log:
check that codec exists before attempting to close it
Modified:
concat/Changelog.diff
concat/ffmpeg.c.diff
concat/ffplay.c.diff
concat/libavcodec/utils.c.diff
concat/libavformat/Makefile.diff
concat/libavformat/allformats.c.diff
concat/libavformat/utils.c.diff
concat/upstreamrev
Modified: concat/Changelog.diff
==============================================================================
--- concat/Changelog.diff Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/Changelog.diff Thu Aug 13 22:53:40 2009 (r5096)
@@ -1,13 +1,17 @@
diff --git a/Changelog b/Changelog
-index 03599fd..6c5d394 100644
+index 1725e75..0eafc3b 100644
--- a/Changelog
+++ b/Changelog
-@@ -31,6 +31,8 @@ version <next>:
+@@ -31,7 +31,12 @@ version <next>:
- RTP depacketization of ASF and RTSP from WMS servers
- RTMP support in libavformat
- noX handling for OPT_BOOL X options
++<<<<<<< HEAD
+- playlist API and concatenation support for ffmpeg
+- demuxers for M3U, PLS, and XSPF playlist formats
++=======
+ - Wave64 demuxer
++>>>>>>> 184d37aca1e2eb2cd2438a77b7fb33a5cefee62b
Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/ffmpeg.c.diff Thu Aug 13 22:53:40 2009 (r5096)
@@ -1,5 +1,5 @@
diff --git a/ffmpeg.c b/ffmpeg.c
-index e899180..0a51a39 100644
+index e5512c2..4b1fbdc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -40,6 +40,7 @@
@@ -10,7 +10,7 @@ index e899180..0a51a39 100644
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
-@@ -1237,7 +1238,8 @@ static void print_report(AVFormatContext **output_files,
+@@ -1232,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 +20,7 @@ index e899180..0a51a39 100644
{
AVFormatContext *os;
AVOutputStream *ost;
-@@ -1249,8 +1251,15 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1244,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 +36,7 @@ index e899180..0a51a39 100644
if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts;
-@@ -1292,6 +1301,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1287,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 +44,7 @@ index e899180..0a51a39 100644
if (ret < 0)
goto fail_decode;
avpkt.data += ret;
-@@ -1398,7 +1408,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
+@@ -1393,7 +1403,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
int frame_size;
ost = ost_table[i];
@@ -52,8 +52,8 @@ index e899180..0a51a39 100644
+ if (ost->source_index == ist_index - stream_offset) {
os = output_files[ost->file_index];
- #if 0
-@@ -2156,6 +2166,8 @@ static int av_encode(AVFormatContext **output_files,
+ /* set the input output pts pairs */
+@@ -2145,6 +2155,8 @@ static int av_encode(AVFormatContext **output_files,
AVPacket pkt;
double ipts_min;
double opts_min;
@@ -62,7 +62,7 @@ index e899180..0a51a39 100644
redo:
ipts_min= 1e100;
-@@ -2241,12 +2253,44 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2230,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 +108,7 @@ index e899180..0a51a39 100644
if (ist->discard)
goto discard_packet;
-@@ -2278,8 +2322,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2267,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 +118,7 @@ index e899180..0a51a39 100644
if (verbose >= 0)
fprintf(stderr, "Error while decoding stream #%d.%d\n",
ist->file_index, ist->index);
-@@ -2300,7 +2343,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2289,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/ffplay.c.diff
==============================================================================
--- concat/ffplay.c.diff Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/ffplay.c.diff Thu Aug 13 22:53:40 2009 (r5096)
@@ -1,5 +1,5 @@
diff --git a/ffplay.c b/ffplay.c
-index c976ac5..2443ad5 100644
+index 814efc5..9af171b 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -29,6 +29,8 @@
@@ -11,7 +11,7 @@ index c976ac5..2443ad5 100644
#include "cmdutils.h"
#include <SDL.h>
-@@ -1335,13 +1337,21 @@ static int video_thread(void *arg)
+@@ -1318,13 +1320,21 @@ static int video_thread(void *arg)
VideoState *is = arg;
AVPacket pkt1, *pkt = &pkt1;
int len1, got_picture;
@@ -35,7 +35,7 @@ index c976ac5..2443ad5 100644
if (packet_queue_get(&is->videoq, pkt, 1) < 0)
break;
-@@ -1349,13 +1359,34 @@ static int video_thread(void *arg)
+@@ -1332,13 +1342,34 @@ static int video_thread(void *arg)
avcodec_flush_buffers(is->video_st->codec);
continue;
}
@@ -73,7 +73,7 @@ index c976ac5..2443ad5 100644
if( (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE)
&& frame->reordered_opaque != AV_NOPTS_VALUE)
-@@ -1365,9 +1396,6 @@ static int video_thread(void *arg)
+@@ -1348,9 +1379,6 @@ static int video_thread(void *arg)
else
pts= 0;
pts *= av_q2d(is->video_st->time_base);
@@ -83,7 +83,7 @@ index c976ac5..2443ad5 100644
if (got_picture) {
if (output_picture2(is, frame, pts) < 0)
goto the_end;
-@@ -1560,50 +1588,68 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1543,50 +1571,68 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
{
AVPacket *pkt_temp = &is->audio_pkt_temp;
AVPacket *pkt = &is->audio_pkt;
@@ -166,7 +166,7 @@ index c976ac5..2443ad5 100644
break;
}
is->audio_buf= is->audio_buf2;
-@@ -1617,9 +1663,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1600,9 +1646,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
/* if no pts, then compute it */
pts = is->audio_clock;
*pts_ptr = pts;
@@ -178,7 +178,7 @@ index c976ac5..2443ad5 100644
#if defined(DEBUG_SYNC)
{
static double last_clock;
-@@ -1631,7 +1677,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1614,7 +1660,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
#endif
return data_size;
}
@@ -186,7 +186,7 @@ index c976ac5..2443ad5 100644
/* free the current packet */
if (pkt->data)
av_free_packet(pkt);
-@@ -1644,7 +1689,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1627,7 +1672,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
if (packet_queue_get(&is->audioq, pkt, 1) < 0)
return -1;
if(pkt->data == flush_pkt.data){
Modified: concat/libavcodec/utils.c.diff
==============================================================================
--- concat/libavcodec/utils.c.diff Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/libavcodec/utils.c.diff Thu Aug 13 22:53:40 2009 (r5096)
@@ -1 +1,13 @@
-
+diff --git a/libavcodec/utils.c b/libavcodec/utils.c
+index 43147a5..c9ec405 100644
+--- a/libavcodec/utils.c
++++ b/libavcodec/utils.c
+@@ -672,7 +672,7 @@ int avcodec_close(AVCodecContext *avctx)
+
+ if (HAVE_THREADS && avctx->thread_opaque)
+ avcodec_thread_free(avctx);
+- if (avctx->codec->close)
++ if (avctx->codec && avctx->codec->close)
+ avctx->codec->close(avctx);
+ avcodec_default_free_buffers(avctx);
+ av_freep(&avctx->priv_data);
Modified: concat/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/libavformat/Makefile.diff Thu Aug 13 22:53:40 2009 (r5096)
@@ -1,5 +1,5 @@
diff --git a/libavformat/Makefile b/libavformat/Makefile
-index 7838efe..351b80b 100644
+index 86dc03f..8a6ecd9 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -33,6 +33,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
@@ -26,7 +26,7 @@ index 7838efe..351b80b 100644
OBJS-$(CONFIG_PVA_DEMUXER) += pva.o
OBJS-$(CONFIG_QCP_DEMUXER) += qcp.o
OBJS-$(CONFIG_R3D_DEMUXER) += r3d.o
-@@ -223,6 +226,7 @@ OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
+@@ -224,6 +227,7 @@ OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o
OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o
OBJS-$(CONFIG_WV_DEMUXER) += wv.o
OBJS-$(CONFIG_XA_DEMUXER) += xa.o
Modified: concat/libavformat/allformats.c.diff
==============================================================================
--- concat/libavformat/allformats.c.diff Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/libavformat/allformats.c.diff Thu Aug 13 22:53:40 2009 (r5096)
@@ -1,5 +1,5 @@
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
-index 569ef50..3e4b1fa 100644
+index 0990598..cbbe1cb 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -66,6 +66,7 @@ void av_register_all(void)
@@ -26,7 +26,7 @@ index 569ef50..3e4b1fa 100644
REGISTER_MUXER (PSP, psp);
REGISTER_DEMUXER (PVA, pva);
REGISTER_DEMUXER (QCP, qcp);
-@@ -199,6 +202,7 @@ void av_register_all(void)
+@@ -200,6 +203,7 @@ void av_register_all(void)
REGISTER_DEMUXER (WSVQA, wsvqa);
REGISTER_DEMUXER (WV, wv);
REGISTER_DEMUXER (XA, xa);
Modified: concat/libavformat/utils.c.diff
==============================================================================
--- concat/libavformat/utils.c.diff Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/libavformat/utils.c.diff Thu Aug 13 22:53:40 2009 (r5096)
@@ -1,5 +1,5 @@
diff --git a/libavformat/utils.c b/libavformat/utils.c
-index 0c1a50d..01824dd 100644
+index b9f6c00..3b652a0 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -27,6 +27,7 @@
Modified: concat/upstreamrev
==============================================================================
--- concat/upstreamrev Thu Aug 13 22:52:16 2009 (r5095)
+++ concat/upstreamrev Thu Aug 13 22:53:40 2009 (r5096)
@@ -1,13 +1,13 @@
ffmpeg:
-svn: 19597
-git: 2d6e5ef7bc1cd33d7d3b34e9dff5cfa490ffaaef
-committer: diego
-commitdate: Wed, 5 Aug 2009 15:27:22 +0000
-commitlog: Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER. The latter can never be enabled without the former.
+svn: 19635
+git: 184d37aca1e2eb2cd2438a77b7fb33a5cefee62b
+committer: ramiro
+commitdate: Thu, 13 Aug 2009 18:47:13 +0000
+commitlog: Introduce av_clip_uint16().
libswscale:
-svn: 19597
-git: b1af9a271e6f587dbcd2b19dbceb4d2ec8eace7e
-committer: cehoyos
-commitdate: Sat, 1 Aug 2009 21:30:36 +0000
-commitlog: Fix regression when converting to nv12/nv21.
+svn: 19635
+git: 7462c6875cb7429cdc33496b4f8b5a9653899374
+committer: ramiro
+commitdate: Thu, 13 Aug 2009 19:03:14 +0000
+commitlog: Indent.
More information about the FFmpeg-soc
mailing list