virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
22,544 Commits 37 Branches 400 Tags 458 MiB
c45ebd5461
Commit Graph

246 Commits

Author SHA1 Message Date
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