[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c, 1.341, 1.342 ffplay.c, 1.49, 1.50
Michael Niedermayer CVS
michael
Mon Aug 15 16:22:45 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv21000
Modified Files:
ffmpeg.c ffplay.c
Log Message:
support fixing missing pts by parsing future frames
Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- ffmpeg.c 10 Aug 2005 23:41:20 -0000 1.341
+++ ffmpeg.c 15 Aug 2005 14:22:42 -0000 1.342
@@ -211,6 +211,7 @@
extern int loop_input; /* currently a hack */
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int gray_only = 0;
+static int genpts = 0;
static int gop_size = 12;
static int intra_only = 0;
@@ -3031,6 +3032,9 @@
print_error(filename, err);
exit(1);
}
+
+ if(genpts)
+ ic->flags|= AVFMT_FLAG_GENPTS;
/* If not enough info to get the stream parameters, we decode the
first frames to get it. (used in mpeg case for example) */
@@ -4340,6 +4344,7 @@
{ "skip_cmp", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&frame_skip_cmp}, "frame skip compare function", "compare function" },
{ "gray", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&gray_only }, "encode/decode grayscale" },
{ "newvideo", OPT_VIDEO, {(void*)opt_new_video_stream}, "add a new video stream to the current output stream" },
+ { "genpts", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, { (void *)&genpts }, "generate pts" },
/* audio options */
{ "ab", HAS_ARG | OPT_AUDIO, {(void*)opt_audio_bitrate}, "set audio bitrate (in kbit/s)", "bitrate", },
Index: ffplay.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffplay.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- ffplay.c 14 Aug 2005 01:29:34 -0000 1.49
+++ ffplay.c 15 Aug 2005 14:22:42 -0000 1.50
@@ -210,6 +210,7 @@
static int thread_count = 1;
static int workaround_bugs = 1;
static int fast = 0;
+static int genpts = 0;
static int lowres = 0;
static int idct = FF_IDCT_AUTO;
static enum AVDiscard skip_frame= AVDISCARD_DEFAULT;
@@ -1802,6 +1803,10 @@
#else
use_play = 0;
#endif
+
+ if(genpts)
+ ic->flags |= AVFMT_FLAG_GENPTS;
+
if (!use_play) {
err = av_find_stream_info(ic);
if (err < 0) {
@@ -2356,6 +2361,7 @@
{ "bug", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&workaround_bugs}, "workaround bugs", "" },
{ "vismv", HAS_ARG | OPT_EXPERT, {(void*)opt_vismv}, "visualize motion vectors", "" },
{ "fast", OPT_BOOL | OPT_EXPERT, {(void*)&fast}, "non spec compliant optimizations", "" },
+ { "genpts", OPT_BOOL | OPT_EXPERT, {(void*)&genpts}, "generate pts", "" },
{ "lowres", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&lowres}, "", "" },
{ "skiploop", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_loop_filter}, "", "" },
{ "skipframe", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&skip_frame}, "", "" },
More information about the ffmpeg-cvslog
mailing list