2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
6947b0c42e
Merge remote-tracking branch 'newdev/master'
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-15 16:48:42 +01:00
3e68b3ba7b
avio: deprecate url_ferror
...
AVIOContext.error should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-15 08:04:28 -04:00
0b82612d35
ffplay: Continue if the file was appended to.
...
This is a bit experimental
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-10 19:57:45 +01:00
76d4c1676f
Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file".
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-08 17:34:02 +01:00
db44ea960d
avio: avio_ prefix for url_fsize
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69
2011-03-08 02:09:21 +01:00
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 17:20:31 -05:00
76aa876e69
avio: avio_ prefix for url_fsize
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 11:03:39 -05:00
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
2011-03-05 02:29:31 +01:00
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:57 -05:00
0ebf475494
lavf: add av_ prefix to dump_format()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 610219a598
2011-02-18 19:52:28 +01:00
610219a598
lavf: add av_ prefix to dump_format()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-16 23:39:56 +00:00
7ffe76e540
Merge libavcore into libavutil
...
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
737eb5976f
Merge libavcore into libavutil
...
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
9d375bf5ec
Remove disabled legacy code in ffplay.
...
The code was setting aspect ratio from the DTG active format, and was
present and disabled since the creation of ffplay.
See thread:
Subject: [FFmpeg-devel] [PATCH] Cosmetics: adopt compact notation in
disabled code.
Date: Sat, 12 Feb 2011 18:46:19 +0100
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit b7ec5cc401
2011-02-14 23:58:21 +01:00
b7ec5cc401
Remove disabled legacy code in ffplay.
...
The code was setting aspect ratio from the DTG active format, and was
present and disabled since the creation of ffplay.
See thread:
Subject: [FFmpeg-devel] [PATCH] Cosmetics: adopt compact notation in
disabled code.
Date: Sat, 12 Feb 2011 18:46:19 +0100
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-14 12:11:56 +00:00
d6705a27d8
ffplay: stats: do not dereference NULL video
...
Also: cosmetic: split this overly long line
2011-02-11 18:59:52 +01:00
043d2ff267
Deprecate avcodec_thread_init()
...
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.
avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.
Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c0b102ca03
2011-02-11 02:54:08 +01:00
b38f008ea6
Frame-based multithreading framework using pthreads
...
See doc/multithreading.txt for details on use in codecs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-11 02:53:58 +01:00
c0b102ca03
Deprecate avcodec_thread_init()
...
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.
avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.
Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 09:17:28 -05:00
37b00b47cb
Frame-based multithreading framework using pthreads
...
See doc/multithreading.txt for details on use in codecs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 09:17:28 -05:00
76ad67cae7
Implement guessed_pts in avcodec_decode_video2
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-07 19:32:07 +01:00
fd0ae17aaf
Adopt pkt_dts/pkt_pts in lavc clients
...
No behavior change; this makes DTS reliable with the next patch.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b47495397
2011-02-06 20:31:45 +01:00
ab543afe47
Make avfilter_graph_free() free the graph.
...
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.
Simplify usage.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4359288c56
2011-02-06 20:31:42 +01:00
6b47495397
Adopt pkt_dts/pkt_pts in lavc clients
...
No behavior change; this makes DTS reliable with the next patch.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-05 16:37:43 -05:00
4359288c56
Make avfilter_graph_free() free the graph.
...
Make avfilter_graph_free() free not only the internal structures, but
also the allocated graph, and set the graph pointer to NULL for
increased safety.
Simplify usage.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-04 02:55:11 +00:00
8904a0f1ee
ffplay: factorize code from video_thread() into configure_video_filters()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75ea596de1
2011-02-04 03:08:09 +01:00
75ea596de1
ffplay: factorize code from video_thread() into configure_video_filters()
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-02 12:09:46 +00:00
2fa1d7b3be
In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.
...
AVCodecContext.reordered_opaque is deprecated for this specific use.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2855080447
2011-01-31 18:25:45 +01:00
97b925ea81
ffplay: in video_thread(), use av_dlog() for timestamp logging.
...
Disable logging of rescaled timestamps if DEBUG is not enabled.
Avoid debug log spamming with -loglevel debug.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 13156f40e1
2011-01-31 18:25:45 +01:00
2855080447
In ffplay:get_video_frame(), use frame->pkt_pts rather than reordered_opaque.
...
AVCodecContext.reordered_opaque is deprecated for this specific use.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-30 19:02:19 +00:00
13156f40e1
ffplay: in video_thread(), use av_dlog() for timestamp logging.
...
Disable logging of rescaled timestamps if DEBUG is not enabled.
Avoid debug log spamming with -loglevel debug.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-30 17:52:01 +00:00
22f73157b7
Remove outdated and confusing comment.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit db2ddd3885
2011-01-23 19:32:07 +01:00
db2ddd3885
Remove outdated and confusing comment.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-22 13:06:06 +00:00
d72858f89f
Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame().
2011-01-17 22:31:11 +01:00
8f83a3b054
Remove outcommented fossil code.
2011-01-17 22:04:06 +01:00
199c18a784
Fix weird indent in get_video_frame().
...
Originally committed as revision 26390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-16 17:26:00 +00:00
24d13ebc15
Reindent after the last commit.
...
Originally committed as revision 26372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 17:21:12 +00:00
112c4b8796
In ffplay, do not open display if -nodisp is set.
...
Fixes issue 1017.
Originally committed as revision 26371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 17:21:09 +00:00
d881a0e895
Cosmetics: fix weird indent.
...
Originally committed as revision 26350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-15 01:28:00 +00:00
393cbb963b
Add AVFrame.pkt_pts that contains the correctly reordered AVPacket.pts
...
Originally committed as revision 26260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 23:07:24 +00:00
be732b7089
Fix ffplay -an/-vn options that were swapped by r26105.
...
Originally committed as revision 26115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 09:52:31 +00:00
0ccabeeaef
Support filters and decoders that dont support negative linesizes.
...
This patch is based on work by stefano.
Originally committed as revision 26108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 15:10:21 +00:00
406f0f1bcf
Use av_find_best_stream in ffplay.
...
Originally committed as revision 26105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-27 09:08:36 +00:00
037be76e15
Add avfilter_graph_create_filter().
...
Originally committed as revision 25862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-02 20:12:27 +00:00
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
1e80a0eaa4
Remove graphparser.h header, move AVFilterInOut and
...
avfilter_graph_parse() declaration to libavfilter/avfiltergraph.h.
Simplify, and less confusing for the user.
Originally committed as revision 25705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-07 22:56:29 +00:00
7313132bcc
Rename AVFilterInOut field filter to filter_ctx, more semantically correct.
...
Originally committed as revision 25700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-07 18:40:18 +00:00
97dd1e4a87
Rename avfilter_graph_destroy() to avfilter_graph_free().
...
The new name is shorter and more consistent with the rest of the API.
This change breaks libavfilter API/ABI.
Originally committed as revision 25674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 20:34:24 +00:00
e15aeea656
Implement avfilter_graph_alloc().
...
Originally committed as revision 25673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 20:34:19 +00:00
ba7d6e798e
Remove usage of deprecated libavcodec/audioconvert.h functions.
...
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 20:19:34 +00:00
ff0652e503
Implement a common get_filtered_video_frame(), shared between ffplay.c
...
and ffmpeg.c.
Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-18 13:57:11 +00:00
2a24df9357
Add avfilter_graph_config().
...
Originally committed as revision 25502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 10:20:53 +00:00
f7ead94c69
Factorize definition of the output_filter defined in both ffplay.c and
...
ffmpeg.c.
Replace it with a more generic definition which can be shared.
Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-12 18:40:26 +00:00
387b4ac993
Fix timebase handling at the begin and at the end of the ffplay video
...
filterchain.
Set timebase in the ffplay input, and make get_filtered_video_frame()
rescale the output frames PTSes according to their timebase.
Originally committed as revision 25450 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-12 18:40:16 +00:00
72ae4aa189
Do not pass an unused variable when initing filt_out. Less confusing.
...
Originally committed as revision 25448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-12 13:47:29 +00:00
27d97fded3
Fix ffplay to keep calling av_read_frame even if EOF has been reached.
...
Patch by Michael Chinen, mchinen gmail
Originally committed as revision 25426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 17:50:17 +00:00
a5c33faacc
Add init and uninit functions to cmdutils, reduces code duplication
...
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.
Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 08:44:33 +00:00
0093ebc20a
User application side of Codec specific parameters.
...
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 23:06:51 +00:00
7a8bfa5d67
Extract timestamp correction code from ffplay.c to cmdutils.c
...
Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 02:05:12 +00:00
6b6bca6443
Enable AV_LOG_SKIP_REPEATED to maintain previous behavior.
...
Originally committed as revision 25175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 15:39:10 +00:00
f66eb58ec4
Make ffplay -h show the settable AVOptions.
...
Originally committed as revision 25167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 00:51:43 +00:00
4afbcf46c9
Reindent.
...
Originally committed as revision 25068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:23:59 +00:00
34017fd9b2
Move av_picture_data_copy() to libavcore, and rename it
...
av_image_copy().
Originally committed as revision 25067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-07 21:23:55 +00:00
91880e4664
Add _XOPEN_SOURCE definition for usleep().
...
patch by Dave Yeo, daveryeo telus net
Originally committed as revision 24893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 21:12:34 +00:00
aa78a6d657
Mention lowres if SDL can't provide the needed resolution.
...
Originally committed as revision 24802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 08:13:14 +00:00
cb036f905f
Fix SDL crash on specific hardware.
...
Patch by Mike Scheutzow, mjs973 optonline net
Originally committed as revision 24801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 07:47:44 +00:00
f7b8c81460
Move do_exit() up for upcoming patch.
...
Patch by Mike Scheutzow, mjs973 optonline net
Originally committed as revision 24800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 07:46:09 +00:00
c1db7bff66
Resize data and linesize in AVFilterBufferRef to 8.
...
This is required to make AVFilterBufferRef able to contain also audio
data, required by audio filtering integration.
Patch by S.N. Hemanth Meenakshisundaram smeen?ks@ucsd.ed ?.
Originally committed as revision 24773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 15:25:42 +00:00
84c0386960
Change avfilter_open() signature, from:
...
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);
This way it is possible to propagate an error code telling the reason
of the failure.
Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:44:51 +00:00
cc80caff52
Separate video specific BufferRef properties into VideoProps.
...
Define a new struct AVFilterBufferRefVideoProps and add a type field
to AVFilterBufferRef.
Video specific properties in AVFilterBufferRefVideoProps are now
referred to by *video pointer in AVFilterBufferRef.
Patch by S.N. Hemanth Meenakshisundaram smeenaks->ucsd.edu.
Originally committed as revision 24763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:06:04 +00:00
5d4890d73d
Rename fields:
...
AVFilterLink.srcpic -> AVFilterLink.src_buf
AVFilterLink.cur_pic -> AVFilterLink.cur_buf
AVFilterLink.outpic -> AVFilterLink.out_buf
The new names are more generic and more consistent, since the struct
they contain, which was named AVFilterPicRef, has been renamed to
AVFilterBufferRef.
Patch by S.N. Hemanth Meenakshisundaram %smeenaks%ucsd%edu%.
Originally committed as revision 24732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:34 +00:00
7fce481a69
Rename functions and fields:
...
avfilter_(un)ref_pic -> avfilter_(un)ref_buffer
avfilter_copy_picref_props -> avfilter_copy_buffer_ref_props
AVFilterBufferRef.pic -> AVFilterBufferRef.buffer
They have been renamed to allow sharing with audio.
Patch by S.N. Hemanth Meenakshisundaram $smeenaks$ucsd$edu$.
Originally committed as revision 24731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:27 +00:00
ecc8dada37
Rename AVFilterPicRef to AVFilterBufferRef.
...
The struct is going to be used for storing audio buffer references as
well, and the new name is more generic.
Patch by S.N. Hemanth Meenakshisundaram @smeenaks@ucsd@edu@.
Originally committed as revision 24730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 01:15:19 +00:00
d54e0948e0
Move format from AVFilterBuffer to AVFilterPicRef.
...
Patch by S.N. Hemanth Meenakshisundaram |smeenaks|ucsd|edu|.
Originally committed as revision 24728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 00:02:26 +00:00
126b638ea0
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
...
in favor of the newly added corresponding functions
av_parse_video_size() and av_parse_video_rate() defined in
libavcore/parseutils.h.
This change also adds a linking-time dependency of libavcodec and of
libavfilter on libavcore.
Originally committed as revision 24518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:12:28 +00:00
e1d7c8831c
Add avsubtitle_free function.
...
Originally committed as revision 24185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 07:35:00 +00:00
00f72577ad
FFplay : Fix segfault when playing monoaural streams.
...
Originally committed as revision 24090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 18:14:58 +00:00
066ce8c93d
Implement -onkeydown and -onmousedown options for ffplay.
...
Patch by Alexei Svitkine cout << name << "." << surname << "@" << "gmail.com".
See thread:
Subject: [FFmpeg-devel] new command-line option for ffplay
Date: Wed, 23 Jun 2010 09:13:50 -0400
Originally committed as revision 24037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-04 12:43:12 +00:00
cfb7e6e6d5
FFplay : Copy all AVFrame fields from the reference picture to the
...
requested buffer.
Originally committed as revision 24032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-03 21:20:32 +00:00
2b4abbd6f5
Move colorspace.h from libavcodec to libavutil.
...
Avoid a compile-time dependency of the pad filter on libavcodec.
Originally committed as revision 23940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 18:49:44 +00:00
7dbbf6a14a
ffplay: remove VLA
...
Originally committed as revision 23892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-29 22:41:20 +00:00
867ab7fb0a
Fix pts reordering code.
...
This fixes a regression introduced when libavfilter support was added to ffplay.
Originally committed as revision 23343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-27 00:31:45 +00:00
12bd3c1f99
FFplay : Implement custom reget_buffer for the input filter.
...
Originally committed as revision 23287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 14:19:44 +00:00
e53ca636d9
Cosmetics : re-indent after last commit.
...
Originally committed as revision 23265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 19:14:59 +00:00
3635c07bd1
FFplay : Avoid manipulating NULL data pointers so that future checks
...
remain valid. This fixes segfaults for those cases where data copy to
this invalid pointer is attempted.
Originally committed as revision 23264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 19:13:17 +00:00
65929418f5
Avoid mixed declaration and code, fix C89 compatibility.
...
Patch by François Revol revol free fr.
Originally committed as revision 23143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-15 17:34:45 +00:00
09ed11e58c
rename -vfilters cli option to -vf in ffplay as well
...
Originally committed as revision 23104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-12 23:18:12 +00:00
3f073fa22c
Fix auto-scaling.
...
Use the numeric value assigned to sws_flags for the sws_flags set in
the graph, rather than the string "bilinear", which is not even
parsable by the scale filter.
Originally committed as revision 23060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-08 21:39:57 +00:00
9b157b0ccd
Fix compilation error of ffmpeg and ffplay with --disable-avdevice.
...
Patch by Cyril Russo, stage D nexvision A laposte net
Originally committed as revision 22940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 08:55:23 +00:00
79f8b328cd
ffplay : Add 's' to the list of supported commands.
...
Originally committed as revision 22823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-09 17:52:34 +00:00
d834d63b0e
Add -t option to ffplay.
...
Patch by Robert Krüger, krueger signal7 de
Originally committed as revision 22764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 20:56:23 +00:00
cf097cbc0b
Cosmetics: indentation
...
Originally committed as revision 22756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 06:41:27 +00:00
c41c5b02d3
Don't create unnecessary refereces to pictures
...
Originally committed as revision 22755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 06:41:25 +00:00
dd0c789be7
Hook decoder up to libavfilter's direct rendering for ffplay
...
Originally committed as revision 22754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 06:41:21 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
1922c0a773
Add a loop option to ffplay.
...
Patch by Robert Krüger, krueger signal7 de
Originally committed as revision 22646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 17:39:51 +00:00
4903b5ca35
Move variable declaration, fixes the warning:
...
ffplay.c:1703: warning: unused variable `pos'
Originally committed as revision 22611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20 21:39:50 +00:00
076db5ed57
Add a -window_title option, which sets the FFplay window title.
...
Patch by Robert Krüger "krueger ET signal7 DOT de".
Originally committed as revision 22588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 23:39:18 +00:00
bb4095133f
Make ffplay pass the packet.pos information to the filterchain, get it
...
again from the filterchain and pass it back to output_picture2().
Originally committed as revision 22507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 11:27:07 +00:00
382f3a5b6f
Print skip_frames variable.
...
Originally committed as revision 22482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 15:12:05 +00:00
2b3da32f74
Make rdft speed user configureable.
...
Change default speed back to a slower variant.
Originally committed as revision 22467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 11:25:51 +00:00
d38c9e7a91
Implement framedrop.
...
Replace SDL timer by a seperate thread, more accurate and less annoying.
frame drop is enabled by default, bug reports welcome.
Fixes issue1191
Originally committed as revision 22452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 02:35:04 +00:00
8a3ceaf4f0
ffplay: use correct format specifiers in printf()
...
Originally committed as revision 22447 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 02:32:03 +00:00
122dcdcb31
Fix some apparent +- errors in the audio vissualization.
...
The bugs become only vissible at higher time resolution than what is
used currently.
Originally committed as revision 22442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 22:43:23 +00:00
d9427e848e
Only reschedule refresh if we successfully removed the scheduled one.
...
Fixes some spurious error messages.
Originally committed as revision 22435 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 16:11:02 +00:00
562f382cab
Increase VIDEO_PICTURE_QUEUE_SIZE to 2.
...
this allows more asynchronous decoding and display thus improving
video smoothness.
It also seems to improve absolute video decoding speed for some reason
Originally committed as revision 22434 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 15:45:46 +00:00
d3d7b12edf
Do not call SDL_SetVideoMode() with the same size as previously
...
as this blanks the window.
Originally committed as revision 22433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 15:39:31 +00:00
6580d5e377
Remove hacks not required since HAVE_AV_CONFIG_H was unset for the apps
...
Originally committed as revision 22295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 22:18:37 +00:00
166621ab72
ffplay: use public fft interface
...
Originally committed as revision 22292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 21:56:48 +00:00
41ea18fb0d
Give RDFT types more meaningful names
...
Originally committed as revision 22290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 21:47:44 +00:00
ff358eca17
Reindent after the last commit.
...
Originally committed as revision 22248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 19:19:13 +00:00
fd9da2527c
Use av_get_pict_type_char() in debug code within output_picture2(),
...
simplify.
Originally committed as revision 22247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 19:19:11 +00:00
1429224b04
Move FFT parts from dsputil.h to fft.h
...
Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:34:46 +00:00
3966a57464
10l fix timestamps (lavfi update broke them)
...
Originally committed as revision 22218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 03:54:39 +00:00
fca6259942
Fix 100l pkt->pos typo.
...
Originally committed as revision 22217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 03:34:47 +00:00
917d2bb348
Libavfilter for ffplay support.
...
This still needs some minor work here and there but should be already functional.
Note that the code pathes that are under "not avfilter" ifdefs as well as the
ifdefs will be droped as soon as all major issues have been det with, aka could
be real soon or not.
Originally committed as revision 22216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 02:20:10 +00:00
8ef9484023
Just ignore streams with unknown codec_type instead of exiting
...
Originally committed as revision 22213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 00:22:37 +00:00
07a70b3825
Add a check for checking if more than one input file is provided to
...
ffplay, make it complain and abort in that case as just one input file
is currently supported.
Originally committed as revision 22139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-01 23:10:27 +00:00
bc77fce6ba
Clear freed pointer in ffplay.c.
...
Fixes a crash when audio stream is cycled twice.
Originally committed as revision 22026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 14:45:18 +00:00
9f7490a09c
Also favor streams with more packets in ffplay.
...
Originally committed as revision 22008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 17:35:44 +00:00
256ab3ed9d
Dont modify wanted_stream.
...
Originally committed as revision 22007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 17:09:53 +00:00
5b369983c6
replace wanted_*_stream by wanted_stream[CODEC_TYPE]
...
Originally committed as revision 22006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 16:56:23 +00:00
6625a3de2a
Replace *_index by st_index[codec_type].
...
Originally committed as revision 22003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 16:46:40 +00:00
f05ef45c8f
Use the official FFmpeg spelling: "ffmpeg" -> "FFmpeg".
...
Originally committed as revision 21935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-21 11:35:17 +00:00
077a8d61c0
fix issue 1747
...
Originally committed as revision 21874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-18 00:19:50 +00:00
fe74099aee
Rename the "enc" variable, which refers to the AVCodecContext of a
...
decoder, to "avctx".
See the thread:
Subject: [FFmpeg-devel] [PATCH] enc is not a good name for a decoder context
Date: Mon, 28 Dec 2009 22:56:25 +0100
Originally committed as revision 21855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 22:38:43 +00:00
6c7165c72e
cosmetics : re-indent after r21639.
...
Originally committed as revision 21658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-06 13:15:15 +00:00
570da52bac
Remove unused variable ref_clock, fix the warning:
...
ffplay.c: In function ‘compute_frame_delay’:
ffplay.c:1064: warning: unused variable ‘ref_clock’
Originally committed as revision 21649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-06 00:05:38 +00:00
bf8ae197b6
make the RDFT vissualizatiom default, the scopes are ugly and eat CPU like
...
piranhas.
Originally committed as revision 21646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 15:26:42 +00:00
4c7c76456d
Make sure the rdft has enough audio available.
...
10l (looks cleaner now)
Originally committed as revision 21645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 15:16:38 +00:00
092421cf0e
Scale rdft vissualization up by 2 so theres no unused space on the top
...
but rather the unimportant high frequencies are cut off if the window is
not a multiple of 2 high.
Originally committed as revision 21641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 11:25:58 +00:00
674fe16371
Do not segfault when doing "ffplay -h"
...
Originally committed as revision 21640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 04:42:20 +00:00
12eeda342a
Pretty RDFT audio visualization.
...
Originally committed as revision 21639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 02:06:38 +00:00
d52ec0029b
Fast seeking.
...
Try clicking with the mouse in the window, hold the button and drag.
Originally committed as revision 21638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 00:37:39 +00:00
2d1653b065
autoexit
...
implements issue1019
Originally committed as revision 21634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-04 01:54:24 +00:00
f5968788bb
Clean after toggling wave.
...
Fixes issue1180.
Originally committed as revision 21632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 23:34:06 +00:00
b25453bdfc
Move is->frame_timer init from start to flush_pkt handling so it is also
...
done on seeking. This fixes the bug where after reaching the end and waiting
a few seconds seeking back to the begin messes up AV sync and playback speed.
Originally committed as revision 21629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 21:33:31 +00:00
566cd2cba1
The convertion between bit and byte is 8 not 60.
...
Fixes wrong cursor key seek distances.
Originally committed as revision 21627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 15:19:19 +00:00
f04c6e35d4
Compare the correct clocks for syncing video to audio/ext.
...
Fixes initial delay on video from issue1134.
Originally committed as revision 21618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 23:22:35 +00:00
48ff3f7cc8
Move the initial refresh scheduling for audio display away from where it
...
can interfere with video.
Originally committed as revision 21616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 22:43:09 +00:00
a3cc2160e0
Commit disapeared hunk, must have editied this out by mistake between local debug statements.
...
This should fix seeking in TS.
Originally committed as revision 21614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 21:31:20 +00:00
70a4764d0e
Autodetect when byte based seeking is better (that is for all formats that allow
...
discontinuities)
Fixes issue1090
Originally committed as revision 21606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 18:02:16 +00:00
1a620dd79e
Use currently displayed file position instead of just url_ftell() for seeking by bytes.
...
This fixes seeking back with the cursor keys and -bytes.
Originally committed as revision 21605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 16:51:02 +00:00
3890dd3a5c
Fix seek flags
...
Originally committed as revision 21603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 16:01:22 +00:00
ecbed31c00
Use parentheses around && within ||, fix the gcc warning:
...
ffplay.c: In function ‘video_thread’:
ffplay.c:1391: warning: suggest parentheses around && within ||
Originally committed as revision 21600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 22:23:17 +00:00
df7d6e484c
Reindent.
...
Originally committed as revision 21599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 22:17:15 +00:00
99e0b12bd7
Make sure the faulty timestamp detection is just done when we have a picture
...
from the decoder.
Originally committed as revision 21593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 13:03:46 +00:00
f7119e42e1
Reset frame_last_delay to 0.
...
This avoids a few ms delay for the first frame after a seek in theory.
Originally committed as revision 21592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 12:31:28 +00:00
acf24b870f
Move frame_last_delay into flush code as it must be reset on seeks to,
...
otherwise the first frame after a seek would be delayed by that amount.
Originally committed as revision 21591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 12:30:14 +00:00
967030eb24
Reset frame_last_pts on flush (and thus also at start)
...
fixes issue558 and probably others.
Originally committed as revision 21590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 12:27:26 +00:00
515bd00e65
Insert a flush packet into the que on init, that way common code between
...
flush and init can be put into the flush handling.
Originally committed as revision 21589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 12:22:12 +00:00
6c7d3ead79
"Flush" the picture que on seeks, this prevents the display thread from
...
having frames from before and after the seek which just isnt a good idea.
Originally committed as revision 21588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 12:19:28 +00:00
b8bb398a40
Schedule refreshes from a thread that actually knows the PTS.
...
Fixes wernfried_1.avi
Originally committed as revision 21586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:30:31 +00:00
68aefbe81c
Fix race condition with reading between video_current_pts and video_current_pts_time.
...
Originally committed as revision 21585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 10:55:51 +00:00
f5668147cb
Try to more completely update time variables on unpause.
...
Could not notice a differenc in behavior.
Originally committed as revision 21584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 10:32:17 +00:00
41a4cd0c33
Simplify get_video_clock()
...
Originally committed as revision 21582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 09:26:30 +00:00
5905536347
10l, forgot HAS_ARG, -drp segfaulted.
...
Originally committed as revision 21581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 03:12:01 +00:00
41db429dd5
decoder reorder pts auto detection.
...
Originally committed as revision 21579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 18:54:32 +00:00
6371c81a92
Fix indention.
...
Originally committed as revision 21578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 18:07:58 +00:00
2ef4605373
Fix seeking by bytes with the mouse and do so by default if the duration is
...
nonsense.
Originally committed as revision 21563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 23:19:59 +00:00
6299a22904
Fix AVFormat AVOprions.
...
Originally committed as revision 21561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 22:47:08 +00:00
79ee468365
Redesign packet queue full check to be more robust.
...
Originally committed as revision 21555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:27:17 +00:00
ce2421a5c3
Bump up MAX_VIDEOQ_SIZE to fix stuttering of oddly interleaved avi files.
...
Fixes issue1211
Originally committed as revision 21554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 20:45:21 +00:00
718c7b18c9
Use av_get_pix_fmt() instead of the deprecated avcodec_get_pix_fmt()
...
function.
Originally committed as revision 21550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 19:10:26 +00:00
c67278098d
Move array specifiers outside DECLARE_ALIGNED() invocations
...
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 03:25:11 +00:00
40ccc754e9
Indent
...
Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 22:55:55 +00:00
68cf92ee5e
Always call avcodec_thread_init()
...
The various avcodec_thread_init() functions are updated to return
immediately after setting avctx->thread_count. This allows -threads 0
to pass through to codecs. It also simplifies the usage for apps
using libavcodec.
Originally committed as revision 21358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 22:55:50 +00:00
de4898a229
Set thread_count in the decoder before to open it.
...
This is safer since avcodec_open() may initialize some structure using
the thread_count default value which will be changed later, causing
potential security / stability issues.
Also do not explicitely set the thread_count value in the decoder,
since this is already done by avcodec_thread_init().
See the thread:
"[FFmpeg-devel] [PATCH] Make ffplay define in the encoder the number of threads *before* to open it",
started in date 2008-03-08.
Originally committed as revision 20954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 21:49:56 +00:00
7f11e745b2
Print usage instead of help when no files are specified.
...
Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-21 02:15:46 +00:00
0c2a18cbcd
Split show_usage() out of show_help().
...
Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-21 02:12:34 +00:00
27daa420fc
First print the program description and then the basic usage line.
...
Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-21 02:09:17 +00:00
813338a00a
Until -DHAVE_AV_CONFIG_H is removed from ffplays compilation, *printf must be #undef.
...
Without this random changes to the header inclusion can trigger
linking failures, and these are not even picked up in some environments
(some fate machines didnt catch it).
Originally committed as revision 20833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 18:46:29 +00:00
e4637d6a60
Show help if no cmd line options are provided at all.
...
This safes the users time to find out which of -h --help -? works.
Originally committed as revision 20822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 13:49:14 +00:00
992f8eaee7
Factorize common commandline options definition.
...
Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 23:12:19 +00:00
8447f0bd74
Split show_formats().
...
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 16:35:55 +00:00
ba11257e48
Add #include for required header config.h.
...
Originally committed as revision 20518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 23:46:11 +00:00
43d160fd00
Prefer "loglevel" over "logging level number or string" as argname of
...
the loglevel command line option.
Make the loglevel option help message more clear, since the option
argument is shown as a single token, and make the whole message better
aligned with the other help messages.
Originally committed as revision 20149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 19:06:27 +00:00
5a6d66640c
Add a -loglevel command line option to ffplay.
...
The -loglevel option makes possible to set the logging level used by
the libav* libraries.
Originally committed as revision 20027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 17:18:02 +00:00
c0b88f1920
Moves the display of metadata to dump_format()
...
Originally committed as revision 19632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-12 13:17:39 +00:00
966116b9f7
Remove some hunks of unused and disabled code cruft.
...
Originally committed as revision 19606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-07 14:53:31 +00:00
98ae6acfee
Make 'stats' a bool option again.
...
To disable stats, use -nostats option.
Originally committed as revision 19581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-04 09:26:33 +00:00
9ebdf3ec93
Increase audio queue size in FFplay so files with big audio/video delay
...
like mov can play nicely.
Originally committed as revision 19554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 22:19:45 +00:00
1e1a0b1845
Display stats by default in FFplay and increase refresh time.
...
Change -stats cli option to take int, so stats can be disabled.
Originally committed as revision 19552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 21:54:50 +00:00
1764e4bc5a
Remove unnecessary rtsp.h #include.
...
Nothing from the header was used and it caused trouble on Windows CE.
Originally committed as revision 19430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-14 13:50:05 +00:00
a7e6312b1e
Remove duplicated RGB_TO_[YUV]_CCIR macros, directly use those defined
...
in libavcodec/colorspace.h.
Originally committed as revision 18922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 23:32:29 +00:00
c2b4c859a6
fix mouse seeking when start time is not set, fix #1083
...
Originally committed as revision 18902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-22 23:08:07 +00:00
3ac56e28b0
Move img_convert_ctx to VideoState and free it in stream_close().
...
Patch by Martin Storsjö, martin martin st
Originally committed as revision 18854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 10:29:55 +00:00
7c5ab14540
Add missing frees to stream_close() and do_exit().
...
Patch by Martin Storsjö, martin martin st
Originally committed as revision 18853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 10:26:41 +00:00
e45aeb38a6
Reset eof state on seeking.
...
Fixes issue1005.
Originally committed as revision 18710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-28 18:02:21 +00:00
26534fe847
indent
...
Originally committed as revision 18630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 21:44:25 +00:00
9dc4176702
Only insert null packets into the video que if there is a video stream.
...
Fixes memleak and should fix issue791.
Originally committed as revision 18629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 21:44:03 +00:00
b40831715a
Avoid 100% CPU useage at EOF.
...
Originally committed as revision 18625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 20:25:20 +00:00
75bb7b0add
Make sure that video frames are flushed at EOF.
...
This should fix a regression.
Originally committed as revision 18624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 20:24:44 +00:00
bea183757b
Use the new avcodec_decode_* API.
...
Patch by Thilo Borgmann thilo.borgmann * googlemail ! com.
Originally committed as revision 18414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-10 12:07:06 +00:00
fbf1b88589
Move declaration of 'pict' closer to where it is used and initialize it.
...
Patch by avcoder: gmail(ffmpeg)
Originally committed as revision 18171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-23 16:43:06 +00:00
4ed29207c2
Switch ffplay to new seeking API.
...
Originally committed as revision 17958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 16:24:30 +00:00
636f1c4cd0
Rename avctx_opts to avcodec_opts.
...
The new name is more meaningful and consistent with avformat_opts
and sws_opts.
Originally committed as revision 17789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 23:32:10 +00:00
4b03756748
Document ffplay -ast, -vst, and -sst options.
...
Originally committed as revision 17694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 17:13:33 +00:00
5dbb63feef
Apply the same logic used for subtitle stream selection to audio and video
...
stream selection.
Make the counting starts from 0, and disable the corresponding playbck
when the selected stream number is negative.
See the thread:
" [FFmpeg-devel] [PATCH] Add documentation for -ast, -vst, -sst".
Originally committed as revision 17693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 17:06:01 +00:00
5ad4f0d473
Simplify the logic for the subtitle stream selection.
...
Originally committed as revision 17692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 17:02:21 +00:00
7f668bb3ea
Fix subtitle selection logic, make ffplay select the subtitle stream N
...
rather than the subtitle stream N-1 when N is not zero.
Originally committed as revision 17691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 16:58:59 +00:00
f7554a99bc
convert ffplay to new metadata API
...
Originally committed as revision 17684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 14:55:21 +00:00
7b776589a2
Take account of struct size in total packet queue size tracking.
...
fix issue806
Originally committed as revision 17476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 16:01:52 +00:00
edf9b2f040
FFplay: Stop processing input file when AVERROR_EOF is returned from av_read_frame()
...
Originally committed as revision 17458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 12:21:09 +00:00
eecc17a7d5
Move debug trace to the new compute_frame_delay() function.
...
Patch by Tomer Barletz: barletz gmail
Originally committed as revision 17434 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 15:25:57 +00:00
712de377f7
Cosmetics: reindent after previous commit.
...
Originally committed as revision 17433 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 15:23:30 +00:00
443658fd8b
Do not force last delay value to its own value.
...
Adapted from a patch by Tomer Barletz: surname chez gmail
Originally committed as revision 17432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 15:23:05 +00:00
49410784de
Extract into its own function the code to compute frame delay.
...
Patch by Tomer Barletz gmail_address(last_name)
Originally committed as revision 17431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-18 15:17:39 +00:00
16a59a7bb6
Add ffplay subtitle stream selection command-line parameter
...
Patch by Björn Axelsson ( gecko A acc D umu D se )
Originally committed as revision 17089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 01:38:12 +00:00
f54b31b9ef
Fix blend_subrect for even-width subrects positioned on odd columns
...
Patch by Björn Axelsson ( gecko A acc D umu D se )
Originally committed as revision 17088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 00:27:04 +00:00
8e2fd8e1d4
Replace the calls to the deprecated av_alloc_format_context() with
...
corresponding calls to avformat_alloc_context().
Originally committed as revision 17048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 08:27:26 +00:00
4606a05979
Fix blend_subrect for some subrects positioned on odd rows.
...
Patch by Björn Axelsson gecko A acc D umu D se
Originally committed as revision 17014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 23:10:05 +00:00
676ef505e6
Fix blend_subrect for subrects positioned on odd rows.
...
Patch by Björn Axelsson gecko A acc D umu D se
Originally committed as revision 17013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 23:07:24 +00:00
f8ca63e8e4
Fix vertical resolution of subtitles.
...
Patch by Björn Axelsson gecko A acc D umu D se
Originally committed as revision 16963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-02 23:24:28 +00:00
2f64239338
Remove detection of mmsh protocol in ffplay.
...
This is useless as long as mmsh is not implemented in libavformat.
This is a revert of r10936.
Originally committed as revision 16687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 21:39:07 +00:00
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
973c68cba0
fix warning: assignment makes pointer from integer without a cast
...
Originally committed as revision 16523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-10 23:49:50 +00:00
1a1078faa4
fix segv, always set audio_buf to audio_buf1 if decoding fail
...
Originally committed as revision 16512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-09 23:54:57 +00:00
600a331c27
Inject NULL packets into the video packet que at EOF to force all delayed
...
frames to be output.
Originally committed as revision 16484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-07 20:45:39 +00:00
25b4c651a3
Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture.
...
Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 19:17:18 +00:00
db4fac64db
Change AVSubtitle.rects to an array of pointers so ABI does not break
...
when the size of AVSubtitleRect changes.
Originally committed as revision 16412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 17:54:48 +00:00
7cf9c6ae40
Display subtitles within the display area.
...
Fixes dvd-subtitle-problem.vob. (problem likely is that the video
resolution is smaller than what the subtitles expect)
Originally committed as revision 16411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-03 17:50:00 +00:00
3a3ee96cd1
Fix files with fps between 0.5 and 0.1.
...
Fixes issue749
Originally committed as revision 16123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 14:45:57 +00:00
7a7da6b42f
Remove unnecessary calls to show_help(), make ffmpeg/ffplay print a
...
specific error message instead.
Originally committed as revision 15868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 23:15:29 +00:00
2c676c33a4
Mark ffplay internal variables static. Patch by Diego Pettenò
...
Originally committed as revision 15546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 09:23:18 +00:00
e43d7a18d8
AVOptions support for ffplay.
...
Originally committed as revision 15451 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 19:39:18 +00:00
047599a4ba
Rename error_resilience to error_recognition.
...
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 18:18:49 +00:00
bb6c34e55b
Fix round to even for aspect ratio correction.
...
Originally committed as revision 15173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 11:16:29 +00:00
cc1f91d771
Ensure that SDL_AddTimer() is never called with a delay of 0 because
...
this leads to a runaway creation of timers. We never pass 0 currently
but it is safer to check for it explicitly as changes to the code can
easily lead to 0 being used.
Originally committed as revision 14934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 00:32:10 +00:00
c30a4489b4
export sample_aspect_ratio read by the demuxer in a separate field
...
that the one read by the decoder.
Originally committed as revision 14932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:13:58 +00:00
7fb262b568
Simplify timestamp reordering by using the new API.
...
Originally committed as revision 14872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 23:17:43 +00:00
3f3fe38d25
Set AVStream.discard, so that demuxers can choose which stream to select if that is a serverside option (as is the case for RTSP). See "Realmedia patch" thread on mailinglist.
...
Originally committed as revision 14825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 17:09:34 +00:00
8a9d72a0ff
Simplify by using FFMAX.
...
Originally committed as revision 14776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 14:30:20 +00:00
5a4476e229
Add sample format converter to FFplay.
...
Originally committed as revision 14508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 05:01:30 +00:00
abdff64682
Simplify AVCodecContext usage within FFplay audio_decode_frame()
...
Originally committed as revision 14503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 01:26:38 +00:00
b81d6235c0
Change opt_sync function behavior to print an error message.
...
Patch by Stefano Sabatini stefano sabatini-lala poste it
Originally committed as revision 13757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 11:33:53 +00:00
f094b6627d
Remove unnecessary header #includes.
...
Extracted from a patch by Erik Hovland, erik hovland org.
Originally committed as revision 13531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 13:40:43 +00:00
ea9c581f61
Simplify show_banner() so that it does not require arguments, similar
...
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 08:48:51 +00:00
a28b7ed488
Add -formats option to ffplay.
...
Patch by Stefano Sabatini stefano sabatini-lala poste it
Originally committed as revision 13246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 07:15:56 +00:00
8fdea2042e
Implement ffplay -L.
...
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 09:49:18 +00:00
20176cbc73
Get rid of more senseless wrapper functions and use OPT_EXIT instead.
...
Originally committed as revision 13233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:41:17 +00:00
64555bd9b1
Do not pass program_name as argument to show_version(), this allows some
...
future simplifications.
Originally committed as revision 13232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:36:32 +00:00
1b068b2984
Let ffplay support "-version".
...
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 14:12:45 +00:00
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
358061f62f
Mark symbols as static, patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com
...
Originally committed as revision 13025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-01 15:10:44 +00:00
e11bc2c663
Send context to ffplay.c:opt_seek
...
Patch by Stefano Sabatini (stefano sabatini-lala poste it)
Originally committed as revision 12663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-01 12:22:33 +00:00
85362796be
Make ffplay.c:opt_seek use parse_time_or_die
...
Patch by Stefano Sabatini (stefano sabatini-lala poste it)
Originally committed as revision 12653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 16:53:19 +00:00
a5b3b5f6c8
Send context to the opt_* functions in ffplay.c
...
Patch by Stefano Sabatini ( stefano sabatini-lala poste it )
Originally committed as revision 12559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-22 18:50:23 +00:00
c7193373fb
Make ffplay use parse_number_or_die instead of atoi.
...
Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 12366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 15:06:43 +00:00
Mans Rullgard
Michael Niedermayer
Anton Khirnov
Benjamin Larsson
Reinhard Tartler
Stefano Sabatini
Nicolas George
Alexander Strange
Michael Chinen
Reimar Döffinger
Dave Yeo
Carl Eugen Hoyos
Mike Scheutzow
S.N. Hemanth Meenakshisundaram
Jai Menon
Alexei Svitkine
François Revol
Baptiste Coudurier
Cyril Russo
Robert Krüger
Bobby Bingham
Diego Biurrun
David Conrad
Ramiro Polla
Vitor Sessak
Peter Ross
Benoit Fouet
Martin Storsjö
Thilo Borgmann
avcoder
Aurelien Jacobs
Tomer Barletz
Björn Axelsson
Diego Pettenò
Ronald S. Bultje
Erik Hovland