Permalink
Browse files

Merge branch 'master' of git://git.videolan.org/ffmpeg into flv-data

  • Loading branch information...
2 parents db61541 + 76ba894 commit 31c012f8ff2a426da968f1df5c485cac61430722 @josephwecker committed Aug 31, 2011
View
@@ -253,8 +253,9 @@ typedef struct InputFile {
int eof_reached; /* true if eof reached */
int ist_index; /* index of first stream in ist_table */
int buffer_size; /* current total buffer size */
- int nb_streams;
int64_t ts_offset;
+ int nb_streams; /* number of stream that avconv is aware of; may be different
+ from ctx.nb_streams if new streams appear during av_read_frame() */
} InputFile;
typedef struct OutputStream {
@@ -1147,11 +1148,10 @@ static void do_video_out(AVFormatContext *s,
{
int nb_frames, i, ret, format_video_sync;
AVFrame *final_picture;
- AVCodecContext *enc, *dec;
+ AVCodecContext *enc;
double sync_ipts;
enc = ost->st->codec;
- dec = ist->st->codec;
sync_ipts = get_sync_ipts(ost) / av_q2d(enc->time_base);
@@ -1205,15 +1205,14 @@ static void do_video_out(AVFormatContext *s,
/* raw pictures are written as AVPicture structure to
avoid any copies. We support temporarily the older
method. */
- AVFrame* old_frame = enc->coded_frame;
- enc->coded_frame = dec->coded_frame; //FIXME/XXX remove this hack
+ enc->coded_frame->interlaced_frame = in_picture->interlaced_frame;
+ enc->coded_frame->top_field_first = in_picture->top_field_first;
pkt.data= (uint8_t *)final_picture;
pkt.size= sizeof(AVPicture);
pkt.pts= av_rescale_q(ost->sync_opts, enc->time_base, ost->st->time_base);
pkt.flags |= AV_PKT_FLAG_KEY;
write_frame(s, &pkt, ost->st->codec, ost->bitstream_filters);
- enc->coded_frame = old_frame;
} else {
AVFrame big_picture;
@@ -2587,12 +2586,6 @@ static int opt_frame_rate(const char *opt, const char *arg)
return 0;
}
-static int opt_frame_crop(const char *opt, const char *arg)
-{
- fprintf(stderr, "Option '%s' has been removed, use the crop filter instead\n", opt);
- return AVERROR(EINVAL);
-}
-
static int opt_frame_size(const char *opt, const char *arg)
{
if (av_parse_video_size(&frame_width, &frame_height, arg) < 0) {
@@ -2602,11 +2595,6 @@ static int opt_frame_size(const char *opt, const char *arg)
return 0;
}
-static int opt_pad(const char *opt, const char *arg) {
- fprintf(stderr, "Option '%s' has been removed, use the pad filter instead\n", opt);
- return -1;
-}
-
static int opt_frame_pix_fmt(const char *opt, const char *arg)
{
if (strcmp(arg, "list")) {
@@ -2785,13 +2773,13 @@ static int opt_map(const char *opt, const char *arg)
}
if (*sync)
sync++;
- for (i = 0; i < input_files[sync_file_idx].ctx->nb_streams; i++)
+ for (i = 0; i < input_files[sync_file_idx].nb_streams; i++)
if (check_stream_specifier(input_files[sync_file_idx].ctx,
input_files[sync_file_idx].ctx->streams[i], sync) == 1) {
sync_stream_idx = i;
break;
}
- if (i == input_files[sync_file_idx].ctx->nb_streams) {
+ if (i == input_files[sync_file_idx].nb_streams) {
av_log(NULL, AV_LOG_ERROR, "Sync stream specification in map %s does not "
"match any streams.\n", arg);
exit_program(1);
@@ -2814,7 +2802,7 @@ static int opt_map(const char *opt, const char *arg)
m->disabled = 1;
}
else
- for (i = 0; i < input_files[file_idx].ctx->nb_streams; i++) {
+ for (i = 0; i < input_files[file_idx].nb_streams; i++) {
if (check_stream_specifier(input_files[file_idx].ctx, input_files[file_idx].ctx->streams[i],
*p == ':' ? p + 1 : p) <= 0)
continue;
@@ -4001,7 +3989,7 @@ static int opt_target(const char *opt, const char *arg)
if(nb_input_files) {
int i, j;
for (j = 0; j < nb_input_files; j++) {
- for (i = 0; i < input_files[j].ctx->nb_streams; i++) {
+ for (i = 0; i < input_files[j].nb_streams; i++) {
AVCodecContext *c = input_files[j].ctx->streams[i]->codec;
if(c->codec_type != AVMEDIA_TYPE_VIDEO)
continue;
@@ -4222,15 +4210,6 @@ static const OptionDef options[] = {
{ "aspect", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_aspect_ratio}, "set aspect ratio (4:3, 16:9 or 1.3333, 1.7777)", "aspect" },
{ "pix_fmt", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_frame_pix_fmt}, "set pixel format, 'list' as argument shows all the pixel formats supported", "format" },
{ "bits_per_raw_sample", OPT_INT | HAS_ARG | OPT_VIDEO, {(void*)&frame_bits_per_raw_sample}, "set the number of bits per raw sample", "number" },
- { "croptop", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
- { "cropbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
- { "cropleft", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
- { "cropright", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop}, "Removed, use the crop filter instead", "size" },
- { "padtop", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
- { "padbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
- { "padleft", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
- { "padright", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
- { "padcolor", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "color" },
{ "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" },
{ "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" },
{ "qscale", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_qscale}, "use fixed video quantizer scale (VBR)", "q" },
View
@@ -13,25 +13,25 @@ libavutil: 2011-04-18
API changes, most recent first:
-2011-08-22 - xxxxxx - lavf 53.10.0
+2011-08-22 - dacd827 - lavf 53.10.0
Add av_find_program_from_stream().
-2011-08-20 - xxxxxx - lavu 51.13.0
+2011-08-20 - 69e2c1a - lavu 51.13.0
Add av_get_media_type_string().
-2011-08-14 - xxxxxx - lavu 51.12.0
+2011-08-14 - 323b930 - lavu 51.12.0
Add av_fifo_peek2(), deprecate av_fifo_peek().
-2011-08-xx - xxxxxxx - lavf 53.4.0
+2011-08-xx - 48f9e45 - lavf 53.8.0
Add avformat_query_codec().
-2011-08-xx - xxxxxxx - lavc 53.8.0
+2011-08-xx - bca06e7 - lavc 53.11.0
Add avcodec_get_type().
-2011-08-06 - 2f63440 - lavf 53.4.0
+2011-08-06 - 2f63440 - lavf 53.7.0
Add error_recognition to AVFormatContext.
-2011-08-02 - 9d39cbf - lavc 53.7.1
+2011-08-02 - 9d39cbf - lavc 53.9.1
Add AV_PKT_FLAG_CORRUPT AVPacket flag.
2011-07-16 - b57df29 - lavfi 2.27.0
@@ -42,10 +42,10 @@ API changes, most recent first:
avfilter_set_common_packing_formats()
avfilter_all_packing_formats()
-2011-07-10 - a67c061 - lavf 53.3.0
+2011-07-10 - a67c061 - lavf 53.6.0
Add avformat_find_stream_info(), deprecate av_find_stream_info().
-2011-07-10 - 0b950fe - lavc 53.6.0
+2011-07-10 - 0b950fe - lavc 53.8.0
Add avcodec_open2(), deprecate avcodec_open().
2011-07-01 - b442ca6 - lavf 53.5.0 - avformat.h
View
@@ -274,20 +274,6 @@ form @var{num}:@var{den}, where @var{num} and @var{den} are the
numerator and denominator of the aspect ratio. For example "4:3",
"16:9", "1.3333", and "1.7777" are valid argument values.
-@item -croptop @var{size}
-@item -cropbottom @var{size}
-@item -cropleft @var{size}
-@item -cropright @var{size}
-All the crop options have been removed. Use -vf
-crop=width:height:x:y instead.
-
-@item -padtop @var{size}
-@item -padbottom @var{size}
-@item -padleft @var{size}
-@item -padright @var{size}
-@item -padcolor @var{hex_color}
-All the pad options have been removed. Use -vf
-pad=width:height:x:y:color instead.
@item -vn
Disable video recording.
@item -bt @var{tolerance}
View
@@ -8,29 +8,31 @@ Overview:
FFmpeg uses Trac for tracking issues, new issues and changes to
existing issues can be done through a web interface.
It is possible to subscribe to individual issues by adding yourself to the
-nosy list or to subscribe to the ffmpeg-issues mailing list which receives
-a mail for every change to every issue. Replies to such mails will also
-be properly added to the respective issue.
+Cc list or to subscribe to the ffmpeg-trac mailing list which receives
+a mail for every change to every issue.
(the above does all work already after light testing)
The subscription URL for the ffmpeg-trac list is:
http(s)://ffmpeg.org/mailman/listinfo/ffmpeg-trac
The URL of the webinterface of the tracker is:
http(s)://ffmpeg.org/trac/ffmpeg
-NOTE: issue = (bug report || patch || feature request)
+NOTE: issue = (bug report || patch || feature request || license violation)
Type:
-----
-bug
+bug / defect
An error, flaw, mistake, failure, or fault in FFmpeg or libav* that
prevents it from behaving as intended.
-feature request
+feature request / enhancement
Request of support for encoding or decoding of a new codec, container
or variant.
Request of support for more, less or plain different output or behavior
where the current implementation cannot be considered wrong.
+license violation
+ ticket to keep track of (L)GPL violations of ffmpeg by others
+
patch
A patch as generated by diff which conforms to the patch submission and
development policy.
@@ -51,6 +53,8 @@ important
the separation to normal is somewhat fuzzy.
For feature requests this priority would be used for things many people
want.
+ Regressions also should be marked as important, regressions are bugs that
+ dont exist in a past revission or another branch.
normal
@@ -80,6 +84,17 @@ closed
final state
+Analyzed flag:
+--------------
+Bugs which have been analyzed and where it is understood what causes them
+and which exact chain of events triggers them. This analysis should be
+available as a message in the bug report.
+Note, do not change the status to analyzed without also providing a clear
+and understandable analysis.
+This state implicates that the bug either has been reproduced or that
+reproduction is not needed as the bug is already understood.
+
+
Type/Status/Substatus:
----------
*/new/new
@@ -107,24 +122,6 @@ Type/Status/Substatus:
Issues for which some information has been requested by the developers,
but which has not been provided by anyone within reasonable time.
-bug/open/reproduced
- Bugs which have been reproduced.
-
-bug/open/analyzed
- Bugs which have been analyzed and where it is understood what causes them
- and which exact chain of events triggers them. This analysis should be
- available as a message in the bug report.
- Note, do not change the status to analyzed without also providing a clear
- and understandable analysis.
- This state implicates that the bug either has been reproduced or that
- reproduction is not needed as the bug is already understood.
-
-bug/open/needs_more_info
- Bug reports which are incomplete and or where more information is needed
- from the submitter or another person who can provide it.
- This state implicates that the bug has not been analyzed or reproduced.
- Note, the idea behind needs_more_info is to offload work from the
- developers to the users whenever possible.
bug/closed/fixed
Bugs which have to the best of our knowledge been fixed.
@@ -158,10 +155,6 @@ patch/closed/applied
patch/closed/rejected
Patches which have been rejected.
-feature_request/open/needs_more_info
- Feature requests where it is not clear what exactly is wanted
- (these also could be closed as invalid ...).
-
feature_request/closed/implemented
Feature requests which have been implemented.
@@ -175,10 +168,8 @@ above without asking on ffmpeg-dev first!
Note2, if you provide the requested info do not forget to remove the
needs_more_info substate.
-Topic:
-------
-A topic is a tag you should add to your issue in order to make grouping them
-easier.
+Component:
+----------
avcodec
issues in libavcodec/*
@@ -198,6 +189,9 @@ ffmpeg
ffplay
issues in or related to ffplay.c
+ffprobe
+ issues in or related to ffprobe.c
+
ffserver
issues in or related to ffserver.c
@@ -207,5 +201,5 @@ build system
regression
bugs which were working in a past revision
-roundup
+trac
issues related to our issue tracker
Oops, something went wrong.

0 comments on commit 31c012f

Please sign in to comment.