Commit Graph

356 Commits

Author SHA1 Message Date
Michael Niedermayer
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
Michael Niedermayer
2d1653b065 autoexit
implements issue1019

Originally committed as revision 21634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-04 01:54:24 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
3890dd3a5c Fix seek flags
Originally committed as revision 21603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 16:01:22 +00:00
Stefano Sabatini
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
Stefano Sabatini
df7d6e484c Reindent.
Originally committed as revision 21599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 22:17:15 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
6371c81a92 Fix indention.
Originally committed as revision 21578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 18:07:58 +00:00
Michael Niedermayer
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
Michael Niedermayer
6299a22904 Fix AVFormat AVOprions.
Originally committed as revision 21561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 22:47:08 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Stefano Sabatini
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
Måns Rullgård
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
Måns Rullgård
40ccc754e9 Indent
Originally committed as revision 21359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 22:55:55 +00:00
Måns Rullgård
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
Stefano Sabatini
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
Ramiro Polla
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
Ramiro Polla
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
Ramiro Polla
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
Michael Niedermayer
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
Michael Niedermayer
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
Stefano Sabatini
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
Michael Niedermayer
8447f0bd74 Split show_formats().
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 16:35:55 +00:00
Diego Biurrun
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
Stefano Sabatini
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
Stefano Sabatini
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
Peter Ross
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
Diego Biurrun
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
Benoit Fouet
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Diego Biurrun
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
Stefano Sabatini
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
Baptiste Coudurier
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
Martin Storsjö
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
Martin Storsjö
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
Michael Niedermayer
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
Michael Niedermayer
26534fe847 indent
Originally committed as revision 18630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-19 21:44:25 +00:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Thilo Borgmann
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
avcoder
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
Michael Niedermayer
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
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Peter Ross
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
Tomer Barletz
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
Benoit Fouet
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
Tomer Barletz
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
Tomer Barletz
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
Björn Axelsson
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
Björn Axelsson
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
Stefano Sabatini
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
Björn Axelsson
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
Björn Axelsson
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
Björn Axelsson
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Baptiste Coudurier
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Stefano Sabatini
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
Diego Pettenò
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Aurelien Jacobs
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
Michael Niedermayer
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
Ronald S. Bultje
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
Michael Niedermayer
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
Peter Ross
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
Peter Ross
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
Stefano Sabatini
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
Erik Hovland
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
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
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
Michael Niedermayer
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
Michael Niedermayer
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
Stefano Sabatini
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
Diego Biurrun
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
Diego Pettenò
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
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
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
Diego Biurrun
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
Michael Niedermayer
cea9642014 Fix ;;
Originally committed as revision 12153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:09:08 +00:00
Justin Ruggles
51b73087b9 fix playing of multichannel audio for codecs without downmixing
Originally committed as revision 11431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-06 02:44:05 +00:00
Ronald S. Bultje
c482500fa3 Drop RTSP default protocol.
patch by Ronald S. Bultje, rsbultje gmail com

Originally committed as revision 11377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-02 19:40:43 +00:00
Andreas Öman
94eadc8ba0 SDL does not seem to support more than two channels.
So, if this is the case, ask for downmixing by the codec.

Originally committed as revision 11223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-15 07:05:14 +00:00
Måns Rullgård
a309073bf4 use av_log_get/set_level()
Originally committed as revision 11209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-12 21:48:50 +00:00
Luca Abeni
c721d803cb Introduce libavdevice
Originally committed as revision 11077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-22 16:10:02 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Björn Axelsson
c03af894eb ffplay currently needs special handling for pausing in some protocols.
Patch by Björn Axelsson: bjorn ; axelsson § intinor : se
Original thread: [FFmpeg-devel] [PATCH] MMSH pause support for ffplay
Date: 11/02/2007 11:47 AM

Originally committed as revision 10936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-06 16:28:32 +00:00
Luca Abeni
c971ff1977 Remove the inclusion of rtsp.h and rtp.h from avformat.h, and
explicitly include such headers where needed

Originally committed as revision 10871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-29 09:15:35 +00:00
Stefano Sabatini
9c5755ee73 Remove unnecessary copyright notice from ffplay.c:show_help.
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 10604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-27 14:45:29 +00:00
Stefano Sabatini
4cfac5bc51 Make ffplay show a banner at startup.
patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 10603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-27 13:52:33 +00:00
Stefano Sabatini
f94361612a Make parse_date return INT64_MIN in case of unparsable input.
Patch by Stefano Sabatini: [stefano sabatini-lala poste it]
Original thread:
[FFmpeg-devel] [PATCH] Enhace documentation forlibavformat/utils.c:parse_date
Date: 08/17/2007 09:40 PM

Originally committed as revision 10533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-19 12:38:07 +00:00
Aurelien Jacobs
b156b88c13 rtp and rtsp demuxer declarations are not part of public API
Originally committed as revision 10474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-10 22:48:42 +00:00
Michael Niedermayer
ec2fc00d62 fix 1fps videos
Originally committed as revision 10276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-31 23:59:45 +00:00
Diego Biurrun
c97f54020d Change SYS_DARWIN preprocessor checks to __APPLE__, they are specific
to Mac OS X rather than to Darwin.

Originally committed as revision 10247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-27 09:17:03 +00:00
Craig Nicol
19cc524ab6 Corrected pause handling when using the 's' step by frame key.
patch by Craig Nicol: [craig nicol /\ ed ac uk]
original thread:[FFmpeg-devel] [PATCH] FFplay speedup if stepping whilst paused
date: 08/02/2007 12:39 PM

Originally committed as revision 10244 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-27 08:06:48 +00:00
Luca Abeni
24c07998b9 Reindent the code after the last commit
Originally committed as revision 10203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-24 07:20:28 +00:00
Luca Abeni
b2e6799bbb Remove RTSP special casing in ffplay startup
Originally committed as revision 10202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-24 07:17:56 +00:00
Luca Barbato
0e6b14c2a7 Stray commit reverted
Originally committed as revision 10198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-23 16:42:32 +00:00
Luca Barbato
2c2b3130c2 PowerPC/CELL/Altivec pointers
Originally committed as revision 10197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-23 16:40:23 +00:00
Diego Biurrun
9d16f87ffd Rename CONFIG_DARWIN to SYS_DARWIN, it is not configurable (in FFmpeg).
Originally committed as revision 10190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-22 22:46:39 +00:00
Stefano Sabatini
f5da5c935d Rename parse_arg_file function to opt_input_file for consistency.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-14 13:58:28 +00:00
Diego Biurrun
9fcfc0b763 cosmetics: indentation fix
Originally committed as revision 10115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-14 09:14:31 +00:00
Stefano Sabatini
60a9966e4d Make cmdutils.c:parse_options accept as argument a function to parse
bare command line parameters.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-13 23:03:36 +00:00
Reimar Döffinger
57cf99f2b7 100l in YUVA_IN macro: missing () caused horrible artefacts in blend_subrect
when subrect y was odd.

Originally committed as revision 10027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 18:58:35 +00:00
Reimar Döffinger
0a8cd69607 Revert r10021, it was committed by accident and is a bit ugly anyway.
Originally committed as revision 10026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 18:52:49 +00:00
Reimar Döffinger
3af56110d4 Scale subtitle position
Originally committed as revision 10021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:45:59 +00:00
Reimar Döffinger
9cb5a11ea8 Fix blend_subrect to respect the boundaries of the destination image
Originally committed as revision 10019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:15:59 +00:00
Stefano Sabatini
aab1b7e56e Make ffmpeg and ffplay exit 0 after displaying help
patch by Stefano Sabatini [stefano sabatini minus lala at poste it]

Originally committed as revision 10012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 12:13:29 +00:00
Alex Beregszaszi
feb7bc6771 cosmetics: be sure all lines fit into 79 characters
Originally committed as revision 9875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-03 18:46:59 +00:00
Alex Beregszaszi
26ba823519 cosmetics: indent correctly
Originally committed as revision 9874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-03 18:45:44 +00:00
Glenn A. Serre
1a3f0ca2e0 Use getCachedContext instead getContext to support resolution change. Patch by Glenn A. Serre
Originally committed as revision 9873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-03 18:44:44 +00:00
Michael Niedermayer
4d8243d362 add vst option to select video stream
Originally committed as revision 9800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-25 20:50:38 +00:00
Ramiro Polla
7c37e504f0 Remove OS/2 support
Originally committed as revision 9586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-10 21:52:04 +00:00