[FFmpeg-soc] [soc]: r4891 - in concat: ffmpeg.c.diff ffplay.c.diff libavformat/Makefile.diff libavformat/allformats.c.diff libavformat/utils.c.diff upstreamrev
gkovacs
subversion at mplayerhq.hu
Sat Aug 1 05:55:44 CEST 2009
Author: gkovacs
Date: Sat Aug 1 05:55:44 2009
New Revision: 4891
Log:
removed added newlines
Modified:
concat/ffmpeg.c.diff
concat/ffplay.c.diff
concat/libavformat/Makefile.diff
concat/libavformat/allformats.c.diff
concat/libavformat/utils.c.diff
concat/upstreamrev
Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff Sat Aug 1 05:39:47 2009 (r4890)
+++ concat/ffmpeg.c.diff Sat Aug 1 05:55:44 2009 (r4891)
@@ -1,5 +1,5 @@
diff --git a/ffmpeg.c b/ffmpeg.c
-index 22bfed8..3b2a603 100644
+index e899180..580c0a6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -70,6 +70,8 @@
@@ -56,15 +56,7 @@ index 22bfed8..3b2a603 100644
if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts;
-@@ -1644,6 +1666,7 @@ static int av_encode(AVFormatContext **output_files,
- uint8_t no_packet[MAX_FILES]={0};
- int no_packet_count=0;
-
-+
- file_table= av_mallocz(nb_input_files * sizeof(AVInputFile));
- if (!file_table)
- goto fail;
-@@ -2278,8 +2301,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2278,8 +2300,7 @@ static int av_encode(AVFormatContext **output_files,
}
//fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->index, pkt.size);
@@ -74,7 +66,7 @@ index 22bfed8..3b2a603 100644
if (verbose >= 0)
fprintf(stderr, "Error while decoding stream #%d.%d\n",
ist->file_index, ist->index);
-@@ -2300,7 +2322,7 @@ static int av_encode(AVFormatContext **output_files,
+@@ -2300,7 +2321,7 @@ static int av_encode(AVFormatContext **output_files,
for(i=0;i<nb_istreams;i++) {
ist = ist_table[i];
if (ist->decoding_needed) {
@@ -83,12 +75,7 @@ index 22bfed8..3b2a603 100644
}
}
-@@ -2848,10 +2870,12 @@ static enum CodecID find_codec_or_die(const char *name, int type, int encoder)
-
- static void opt_input_file(const char *filename)
- {
-+
- AVFormatContext *ic;
+@@ -2852,6 +2873,7 @@ static void opt_input_file(const char *filename)
AVFormatParameters params, *ap = ¶ms;
int err, i, ret, rfps, rfps_base;
int64_t timestamp;
@@ -96,7 +83,7 @@ index 22bfed8..3b2a603 100644
if (!strcmp(filename, "-"))
filename = "pipe:";
-@@ -2859,6 +2883,24 @@ static void opt_input_file(const char *filename)
+@@ -2859,6 +2881,24 @@ static void opt_input_file(const char *filename)
using_stdin |= !strncmp(filename, "pipe:", 5) ||
!strcmp(filename, "/dev/stdin");
@@ -121,7 +108,7 @@ index 22bfed8..3b2a603 100644
/* get default parameters from command line */
ic = avformat_alloc_context();
-@@ -2925,6 +2967,8 @@ static void opt_input_file(const char *filename)
+@@ -2925,6 +2965,8 @@ static void opt_input_file(const char *filename)
start_time = 0;
}
@@ -130,7 +117,7 @@ index 22bfed8..3b2a603 100644
/* update the current parameters so that they match the one of the input stream */
for(i=0;i<ic->nb_streams;i++) {
AVCodecContext *enc = ic->streams[i]->codec;
-@@ -3000,6 +3044,8 @@ static void opt_input_file(const char *filename)
+@@ -3000,6 +3042,8 @@ static void opt_input_file(const char *filename)
dump_format(ic, nb_input_files, filename, 0);
nb_input_files++;
Modified: concat/ffplay.c.diff
==============================================================================
--- concat/ffplay.c.diff Sat Aug 1 05:39:47 2009 (r4890)
+++ concat/ffplay.c.diff Sat Aug 1 05:55:44 2009 (r4891)
@@ -1,8 +1,8 @@
diff --git a/ffplay.c b/ffplay.c
-index 5f88a46..b49b978 100644
+index 4d7abb3..826f320 100644
--- a/ffplay.c
+++ b/ffplay.c
-@@ -30,6 +30,8 @@
+@@ -29,6 +29,8 @@
#include "libavcodec/colorspace.h"
#include "libavcodec/opt.h"
@@ -11,7 +11,7 @@ index 5f88a46..b49b978 100644
#include "cmdutils.h"
#include <SDL.h>
-@@ -1336,28 +1338,65 @@ static int video_thread(void *arg)
+@@ -1335,28 +1337,65 @@ static int video_thread(void *arg)
VideoState *is = arg;
AVPacket pkt1, *pkt = &pkt1;
int len1, got_picture;
@@ -80,7 +80,7 @@ index 5f88a46..b49b978 100644
if( (decoder_reorder_pts || pkt->dts == AV_NOPTS_VALUE)
&& frame->reordered_opaque != AV_NOPTS_VALUE)
pts= frame->reordered_opaque;
-@@ -1366,9 +1405,6 @@ static int video_thread(void *arg)
+@@ -1365,9 +1404,6 @@ static int video_thread(void *arg)
else
pts= 0;
pts *= av_q2d(is->video_st->time_base);
@@ -90,7 +90,7 @@ index 5f88a46..b49b978 100644
if (got_picture) {
if (output_picture2(is, frame, pts) < 0)
goto the_end;
-@@ -1561,50 +1597,76 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1560,50 +1596,76 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
{
AVPacket *pkt_temp = &is->audio_pkt_temp;
AVPacket *pkt = &is->audio_pkt;
@@ -179,7 +179,7 @@ index 5f88a46..b49b978 100644
break;
}
is->audio_buf= is->audio_buf2;
-@@ -1618,9 +1680,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1617,9 +1679,9 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
/* if no pts, then compute it */
pts = is->audio_clock;
*pts_ptr = pts;
@@ -191,7 +191,7 @@ index 5f88a46..b49b978 100644
#if defined(DEBUG_SYNC)
{
static double last_clock;
-@@ -1632,7 +1694,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1631,7 +1693,6 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
#endif
return data_size;
}
@@ -199,7 +199,7 @@ index 5f88a46..b49b978 100644
/* free the current packet */
if (pkt->data)
av_free_packet(pkt);
-@@ -1645,7 +1706,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
+@@ -1644,7 +1705,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/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff Sat Aug 1 05:39:47 2009 (r4890)
+++ concat/libavformat/Makefile.diff Sat Aug 1 05:55:44 2009 (r4891)
@@ -1,5 +1,5 @@
diff --git a/libavformat/Makefile b/libavformat/Makefile
-index f95b426..002b5d4 100644
+index 7838efe..2377365 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -33,6 +33,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o
Modified: concat/libavformat/allformats.c.diff
==============================================================================
--- concat/libavformat/allformats.c.diff Sat Aug 1 05:39:47 2009 (r4890)
+++ concat/libavformat/allformats.c.diff Sat Aug 1 05:55:44 2009 (r4891)
@@ -1,5 +1,5 @@
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
-index ad47631..ef642c4 100644
+index 569ef50..3e4b1fa 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -66,6 +66,7 @@ void av_register_all(void)
Modified: concat/libavformat/utils.c.diff
==============================================================================
--- concat/libavformat/utils.c.diff Sat Aug 1 05:39:47 2009 (r4890)
+++ concat/libavformat/utils.c.diff Sat Aug 1 05:55:44 2009 (r4891)
@@ -1,8 +1,8 @@
diff --git a/libavformat/utils.c b/libavformat/utils.c
-index 3fce3fa..6e9ed25 100644
+index 0c1a50d..280bcb7 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
-@@ -908,6 +908,10 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
+@@ -910,6 +910,10 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
{
AVStream *st;
int len, ret, i;
@@ -13,7 +13,7 @@ index 3fce3fa..6e9ed25 100644
av_init_packet(pkt);
-@@ -941,8 +945,14 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
+@@ -943,8 +947,14 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
/* return packet if any */
if (pkt->size) {
got_packet:
@@ -29,7 +29,7 @@ index 3fce3fa..6e9ed25 100644
pkt->pts = st->parser->pts;
pkt->dts = st->parser->dts;
pkt->pos = st->parser->pos;
-@@ -978,8 +988,11 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
+@@ -980,8 +990,11 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
NULL, 0,
AV_NOPTS_VALUE, AV_NOPTS_VALUE,
AV_NOPTS_VALUE);
Modified: concat/upstreamrev
==============================================================================
--- concat/upstreamrev Sat Aug 1 05:39:47 2009 (r4890)
+++ concat/upstreamrev Sat Aug 1 05:55:44 2009 (r4891)
@@ -1,13 +1,13 @@
ffmpeg:
-svn: 19424
-git: 806496708b491d2f825309f6e3b4f6c6f7c7d085
-committer: diego
-commitdate: Mon, 13 Jul 2009 17:16:36 +0000
-commitlog: Only #define lseek to _lseeki64 on MinGW, not MinGW CE. This fixes compilation on WinCE, which does not support _lseeki64. patch by Ismail Dönmez, ismail namtrac org
+svn: 19556
+git: 286d8e676cb471e8ee678de1dd30a99cf42498f3
+committer: mru
+commitdate: Fri, 31 Jul 2009 07:40:35 +0000
+commitlog: RTMP needs tcp_protocol
libswscale:
-svn: 19424
-git: f3ae90a5d9f9e01b326c031803b977be3d5369c0
+svn: 19556
+git: 2e681b9f903764844ffc514d9da9b96799a4b59f
committer: ramiro
-commitdate: Thu, 9 Jul 2009 02:27:39 +0000
-commitlog: Remove dependency from swscale_internal.h to lavu/internal.h, it is no longer needed for DECLARE_ALIGNED. Remove dependency from swscale-example.c to swscale_internal.h by duplicating the necessary code. The duplicated code is a hack and should be removed once a cleaner pixel format information system exists. swscale-example.c is example code on how to use the library and therefore shouldn't rely on internal headers.
+commitdate: Tue, 28 Jul 2009 05:45:47 +0000
+commitlog: MMX2 scaler: Remove {} block leftover from factorization in initMMX2Scaler(). Merge variable declarations to previous {} block and indent.
More information about the FFmpeg-soc
mailing list