[FFmpeg-soc] [soc]: r5727 - in libavfilter: checkout.sh diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vf_drawbox.c vf_fifo.c vf_fps.c vf_hflip.c vf_negate.c vf_overlay.c vf_pad.c vf_rotate.c vf_set...
stefano
subversion at mplayerhq.hu
Wed Mar 31 21:25:33 CEST 2010
Author: stefano
Date: Wed Mar 31 21:25:33 2010
New Revision: 5727
Log:
Update to FFmpeg r22749 / libswscale r30979.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/02_ffmpeg_filters.diff
libavfilter/diffs/03_libavfilter_doc.diff
libavfilter/vf_drawbox.c
libavfilter/vf_fifo.c
libavfilter/vf_fps.c
libavfilter/vf_hflip.c
libavfilter/vf_negate.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_rotate.c
libavfilter/vf_setpts.c
libavfilter/vf_split.c
libavfilter/vf_transpose.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_movie.c
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/checkout.sh Wed Mar 31 21:25:33 2010 (r5727)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22626
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22749
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r30945
+svn up -r30979
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Wed Mar 31 21:25:33 2010 (r5727)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 22626)
+--- ffmpeg.c (revision 22749)
+++ ffmpeg.c (working copy)
@@ -43,6 +43,13 @@
#include "libavutil/libm.h"
@@ -237,7 +237,7 @@ Index: ffmpeg.c
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
-@@ -893,7 +1093,9 @@
+@@ -923,7 +1123,9 @@
int *frame_size)
{
int nb_frames, i, ret;
@@ -247,7 +247,7 @@ Index: ffmpeg.c
AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
AVFrame picture_crop_temp, picture_pad_temp;
AVCodecContext *enc, *dec;
-@@ -941,6 +1143,9 @@
+@@ -971,6 +1173,9 @@
if (nb_frames <= 0)
return;
@@ -257,7 +257,7 @@ Index: ffmpeg.c
if (ost->video_crop) {
if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) {
fprintf(stderr, "error cropping picture\n");
-@@ -952,6 +1157,7 @@
+@@ -982,6 +1187,7 @@
} else {
formatted_picture = in_picture;
}
@@ -265,7 +265,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -978,6 +1184,7 @@
+@@ -1008,6 +1214,7 @@
av_exit(1);
}
@@ -273,7 +273,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -1025,6 +1232,7 @@
+@@ -1055,6 +1262,7 @@
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
}
@@ -281,7 +281,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1290,6 +1498,10 @@
+@@ -1320,6 +1528,10 @@
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -292,7 +292,7 @@ Index: ffmpeg.c
AVPacket avpkt;
int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
-@@ -1417,6 +1629,15 @@
+@@ -1447,6 +1659,15 @@
&buffer_to_free);
}
@@ -306,9 +306,9 @@ Index: ffmpeg.c
+#endif
+
// preprocess audio (volume)
- if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
+ if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1438,10 +1659,18 @@
+@@ -1468,10 +1689,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -328,17 +328,17 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1459,6 +1688,9 @@
+@@ -1489,6 +1718,9 @@
do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size);
break;
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
+#if CONFIG_AVFILTER
+ ost->st->codec->sample_aspect_ratio = ist->picref->pixel_aspect;
+#endif
do_video_out(os, ost, ist, &picture, &frame_size);
if (vstats_filename && frame_size)
do_video_stats(os, ost, frame_size);
-@@ -1527,7 +1759,17 @@
+@@ -1557,7 +1789,17 @@
av_free_packet(&opkt);
}
}
@@ -356,7 +356,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -2009,9 +2251,10 @@
+@@ -2039,9 +2281,10 @@
av_exit(1);
}
@@ -368,7 +368,7 @@ Index: ffmpeg.c
codec->bits_per_raw_sample= 0;
}
ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
-@@ -2019,6 +2262,13 @@
+@@ -2049,6 +2292,13 @@
ost->resample_pix_fmt= icodec->pix_fmt;
ost->encoding_needed = 1;
ist->decoding_needed = 1;
@@ -380,9 +380,9 @@ Index: ffmpeg.c
+ }
+#endif
break;
- case CODEC_TYPE_SUBTITLE:
+ case AVMEDIA_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -2417,6 +2667,12 @@
+@@ -2447,6 +2697,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -395,7 +395,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -4014,6 +4270,9 @@
+@@ -4023,6 +4279,9 @@
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
@@ -405,7 +405,7 @@ Index: ffmpeg.c
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
{ "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
-@@ -4074,6 +4333,9 @@
+@@ -4083,6 +4342,9 @@
avcodec_register_all();
avdevice_register_all();
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/diffs/03_libavfilter_doc.diff Wed Mar 31 21:25:33 2010 (r5727)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 22626)
+--- doc/libavfilter.texi (revision 22749)
+++ doc/libavfilter.texi (working copy)
@@ -139,6 +139,20 @@
Modified: libavfilter/vf_drawbox.c
==============================================================================
--- libavfilter/vf_drawbox.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_drawbox.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -137,7 +137,7 @@ AVFilter avfilter_vf_drawbox=
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = avfilter_null_start_frame,
.end_frame = end_frame,
@@ -147,6 +147,6 @@ AVFilter avfilter_vf_drawbox=
.rej_perms = AV_PERM_PRESERVE },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_fifo.c
==============================================================================
--- libavfilter/vf_fifo.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_fifo.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -106,7 +106,7 @@ AVFilter avfilter_vf_fifo =
.priv_size = sizeof(BufferContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = start_frame,
.draw_slice = draw_slice,
@@ -114,7 +114,7 @@ AVFilter avfilter_vf_fifo =
.rej_perms = AV_PERM_REUSE2, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame, },
{ .name = NULL}},
};
Modified: libavfilter/vf_fps.c
==============================================================================
--- libavfilter/vf_fps.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_fps.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -117,13 +117,13 @@ AVFilter avfilter_vf_fps =
.priv_size = sizeof(FPSContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = start_frame,
.end_frame = end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.poll_frame = poll_frame,
.request_frame = request_frame, },
{ .name = NULL}},
Modified: libavfilter/vf_hflip.c
==============================================================================
--- libavfilter/vf_hflip.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_hflip.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -94,13 +94,13 @@ AVFilter avfilter_vf_hflip =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.draw_slice = draw_slice,
.config_props = config_props,
.min_perms = AV_PERM_READ, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_negate.c
==============================================================================
--- libavfilter/vf_negate.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_negate.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -118,13 +118,13 @@ AVFilter avfilter_vf_negate =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.draw_slice = draw_slice,
.config_props = config_props,
.min_perms = AV_PERM_READ, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_overlay.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -342,7 +342,7 @@ AVFilter avfilter_vf_overlay =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
.config_props = config_input_main,
.draw_slice = draw_slice,
@@ -350,7 +350,7 @@ AVFilter avfilter_vf_overlay =
.min_perms = AV_PERM_READ,
.rej_perms = AV_PERM_REUSE2, },
{ .name = "sub",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
.config_props = config_input_overlay,
.draw_slice = draw_slice,
@@ -359,7 +359,7 @@ AVFilter avfilter_vf_overlay =
.rej_perms = AV_PERM_REUSE2, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame, },
{ .name = NULL}},
};
Modified: libavfilter/vf_pad.c
==============================================================================
--- libavfilter/vf_pad.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_pad.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -311,7 +311,7 @@ AVFilter avfilter_vf_pad = {
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_input,
.get_video_buffer = get_video_buffer,
.start_frame = start_frame,
@@ -320,7 +320,7 @@ AVFilter avfilter_vf_pad = {
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.config_props = config_output, },
{ .name = NULL}},
};
Modified: libavfilter/vf_rotate.c
==============================================================================
--- libavfilter/vf_rotate.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_rotate.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -192,7 +192,7 @@ AVFilter avfilter_vf_rotate =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
.draw_slice = draw_slice,
.end_frame = end_frame,
@@ -201,7 +201,7 @@ AVFilter avfilter_vf_rotate =
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.config_props = config_props_output,
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_setpts.c
==============================================================================
--- libavfilter/vf_setpts.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_setpts.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -131,11 +131,11 @@ AVFilter avfilter_vf_setpts =
.priv_size = sizeof(SetPTSContext),
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= get_video_buffer,
.start_frame = start_frame,},
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,},
+ .type = AVMEDIA_TYPE_VIDEO,},
{ .name = NULL}},
};
Modified: libavfilter/vf_split.c
==============================================================================
--- libavfilter/vf_split.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_split.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -48,16 +48,16 @@ AVFilter avfilter_vf_split =
.name = "split",
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.get_video_buffer= avfilter_null_get_video_buffer,
.start_frame = start_frame,
.draw_slice = draw_slice,
.end_frame = end_frame, },
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = "default2",
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vf_transpose.c
==============================================================================
--- libavfilter/vf_transpose.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vf_transpose.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -120,7 +120,7 @@ AVFilter avfilter_vf_transpose =
.query_formats = query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.start_frame = start_frame,
.end_frame = end_frame,
.config_props = config_props_input,
@@ -128,7 +128,7 @@ AVFilter avfilter_vf_transpose =
{ .name = NULL}},
.outputs = (AVFilterPad[]) {{ .name = "default",
.config_props = config_props_output,
- .type = CODEC_TYPE_VIDEO, },
+ .type = AVMEDIA_TYPE_VIDEO, },
{ .name = NULL}},
};
Modified: libavfilter/vsrc_buffer.c
==============================================================================
--- libavfilter/vsrc_buffer.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vsrc_buffer.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -132,7 +132,7 @@ AVFilter avfilter_vsrc_buffer =
.inputs = (AVFilterPad[]) {{ .name = NULL }},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame,
.poll_frame = poll_frame,
.config_props = config_props, },
Modified: libavfilter/vsrc_movie.c
==============================================================================
--- libavfilter/vsrc_movie.c Sat Mar 27 16:59:57 2010 (r5726)
+++ libavfilter/vsrc_movie.c Wed Mar 31 21:25:33 2010 (r5727)
@@ -86,7 +86,7 @@ static int movie_init(AVFilterContext *c
// TODO: allow to choose the video stream
mv->video_stream = -1;
for(i = 0; i < mv->format_ctx->nb_streams; i++)
- if(mv->format_ctx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) {
+ if(mv->format_ctx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) {
mv->video_stream = i;
break;
}
@@ -264,7 +264,7 @@ AVFilter avfilter_vsrc_movie =
.inputs = (AVFilterPad[]) {{ .name = NULL }},
.outputs = (AVFilterPad[]) {{ .name = "default",
- .type = CODEC_TYPE_VIDEO,
+ .type = AVMEDIA_TYPE_VIDEO,
.request_frame = request_frame,
.config_props = config_props, },
{ .name = NULL}},
More information about the FFmpeg-soc
mailing list