virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
18,646 Commits 37 Branches 400 Tags 467 MiB
5e622c401f
Commit Graph

193 Commits

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