virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
66,299 Commits 37 Branches 400 Tags 465 MiB
7c3ba1b83a
Commit Graph

5045 Commits

Author SHA1 Message Date
Steven Liu
2c21e8b1a4 lavf/hls: add hls_ts_option 
Same as COMMITID 4f5493fe23.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-09-16 16:30:03 +02:00
Stefano Sabatini
3a0c70f1e3 doc/examples/transcoding: use av_packet_rescale_ts() 
Simplify.
 2014-09-16 14:55:33 +02:00
Mika Raento
f685f7d7a8 hlsenc: single_file, support HLS ver 4 byteranges 
This adds a new option -hls_flags single_file that creates one .ts file
for HLS and adds byteranges to the .m3u8 file, instead of creating one
.ts file for each segment.

This is helpful at least for storing large number of videos, as the
number of files per video is drastically reduced and copying and storing
those files takes less requests and inodes.

This is based on work by Nicolas Martyanoff, discussed on ffmpeg-devel
in July 2014. That patch seems abandoned by the author, and contained
unrelated changes. This patch tries to add the minimum amount of code to
support the byterange playlists.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-15 22:16:44 +02:00
Michael Niedermayer
68bca03951 doc/examples: remove unneeded NULL checks 
dst_file cannot be NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 16:45:50 +02:00
Michael Niedermayer
fa1b563196 doc/APIchanges: Update hashes and dates 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 12:45:36 +02:00
Clément Bœsch
b97e27082b doc/APIchanges: attempt to split releases 
Based on several git show origin/release/X.Y:doc/APIchanges.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 12:44:06 +02:00
Andreas Cadhalpun
8f537420ae doc: mention in APIChanges that AVProbeData must be initialized due to the new mime_type field 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 01:13:25 +02:00
Andreas Cadhalpun
d5e802609a doc: document the addition of the AVProbeData.mime_type field and it's implications 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-13 00:36:14 +02:00
James Darnley
e3fb2b0eb7 docs: add example around the suggested commit message format 
It gets rendered inline in HTML and becomes not very clear.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-12 01:59:44 +02:00
Michael Niedermayer
5e3da25618 Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04' 
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-11 01:27:38 +02:00
Diego Biurrun
775a0b04f0 doc: Fix syntax and logical errors in avconv stream combination example 
Bug-Id: 661
CC: libav-stable@libav.org
 2014-09-10 20:30:36 +02:00
Carl Eugen Hoyos
42b4da75b7 Print bits_per_raw_sample for ffprobe -show_streams. 
Fixes ticket #3919.
 2014-09-08 17:49:20 +02:00
Andreas Cadhalpun
a5b20bf4b2 doc/filters.texi: improve the wording of the expr_int_format documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-07 18:29:06 +02:00
Stefano Sabatini
de1f0c94cd doc/muxers/segment: reword text for examples, improve consistency 2014-09-07 13:17:46 +02:00
Stefano Sabatini
4f5493fe23 lavf/segment: add segment_format_options option 2014-09-07 13:17:46 +02:00
Michael Niedermayer
f9bc65e399 Merge commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce' 
* commit '041caf1a63f091745b95a6d51c23fbdcb604d4ce':
  avplay: Exit by default at the end of playback

Conflicts:
	Changelog
	ffplay.c

Changes to ffplay not merged as they would break -autoexit as a way to override -noautoexit,
the change of the default will be implemented in the next commit

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-06 20:23:29 +02:00
Diego Biurrun
041caf1a63 avplay: Exit by default at the end of playback 
This is the expected behavior shared by all other cli multimedia players.

Bug-Id: 732
 2014-09-06 16:52:59 +02:00
db0company
c701178900 doc: Copyright in CSS, CSS split in 2 files 
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-06 01:37:31 +02:00
Paul B Mahol
422619646e add silenceremove filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-09-05 17:30:57 +00:00
Mark Harris
ef16d12606 doc/filters.texi: fix time duration references 
Make time duration references consistent, using @ref links, and
eliminate incorrect syntax [-]HH[:MM[:SS[.m...]]].

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2014-09-05 11:20:07 +02:00
Anton Khirnov
12f0388f9c Add release notes for 11. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-04 07:14:27 -07:00
Timothy Gu
17ad5fbb8a Use makeinfo to generate html doc for the new website 
texi2html is deprecated by upstream in favor of makeinfo/texi2any. See:

- https://www.gnu.org/software/texinfo/manual/texinfo/html_node/texi2html.html
- https://wiki.debian.org/Texi2htmlTransition
- https://lists.debian.org/debian-devel/2013/05/msg01516.html

This is actually two separate changes.

Based on a patch by Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>.

Fixes Trac ticket #3232.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2014-09-04 02:34:20 +02:00
Lou Logan
efaa4a8dbf doc/demuxers: document gif demuxer 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2014-09-03 10:16:05 -08:00
Michael Niedermayer
4d13d440ee Merge commit '94f084324e648876508bed546d950762f10b875e' 
* commit '94f084324e648876508bed546d950762f10b875e':
  texi2pod: Make it output a single encoding string

Conflicts:
	doc/texi2pod.pl

See: 12ce58bebd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-03 12:24:47 +02:00
Luca Barbato
94f084324e texi2pod: Make it output a single encoding string 
Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.
 2014-09-03 02:14:17 +02:00
Rong Yan
6abeaf2781 build sys: enable the decoding_encoding example under the ffmpeg/doc/examples 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-02 04:19:15 +02:00
Mark Harris
1b3a98f137 doc/filters.texi: fix filter name in examples 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 21:50:52 +02:00
Timothy Gu
8d6ec61186 general: Fix usage of @float 
makeinfo chokes on that.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-01 16:21:44 +02:00
Michael Niedermayer
f30a8154ab Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5' 
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/utils.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-28 22:23:01 +02:00
Vittorio Giovara
9301486408 avcodec: add stream-level stereo3d side data 2014-08-28 12:33:26 -04:00
Stefano Sabatini
fa39f8c0e2 doc/ffprobe: fix -show_entries example 2014-08-28 12:20:18 +02:00
Deb Mukherjee
b6a0b8bcf4 Adds support for setting aq_mode in libvpx encoder 
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-08-27 23:12:47 -03:00
James Darnley
8c1b942ad7 Replace incorrect use of "multiply" with "multiple" 
Also replace the plural form "multiplies" with "multiples".
 2014-08-27 16:00:17 -08:00
Michael Niedermayer
ffa90d99fd Merge commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d' 
* commit '56a721f020273d69daa8dcb0d99e42a43a0a0d4d':
  doc: fix a typo

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 20:48:07 +02:00
Gabriel Dume
56a721f020 doc: fix a typo 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-08-26 17:27:15 +02:00
Michael Niedermayer
1f7e6c0713 doc/snow: remove possibly wrong todo item 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-26 01:19:26 +02:00
Michael Niedermayer
beaf86bd02 doc/APIchanges: fill in dates and hashes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 15:57:37 +02:00
Michael Niedermayer
215db2935b Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d' 
* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
  lavf: add AVFormatContext.max_ts_probe

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/utils.c
	libavformat/version.h

lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 13:25:09 +02:00
Michael Niedermayer
f1b04f803e Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6' 
* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-25 12:09:29 +02:00
Anton Khirnov
b263f8ffe7 lavf: add AVFormatContext.max_ts_probe 
It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.
 2014-08-25 05:17:54 +00:00
Anton Khirnov
6ca11f7157 doc/APIchanges: fill in missing hashes and dates 2014-08-25 05:16:26 +00:00
Clément Bœsch
f888331769 avfilter: add codecview filter 2014-08-24 14:35:11 +02:00
Carl Eugen Hoyos
6f78c70324 doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate. 2014-08-24 02:49:06 +02:00
Clément Bœsch
f4dec0dba0 doc/filters: fix Shwo/Show typo 2014-08-23 16:07:55 +02:00
Reimar Döffinger
8fc9bd0d32 dict.c: Free non-strduped av_dict_set arguments on error. 
Unfortunately this was not explicitly documented and thus
might be risky.
But all uses I could find in FFmpeg and one in VLC had a memleak
in these cases, and I could not find any that relied on the previous
behaviour.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-23 15:28:48 +02:00
Muhammad Faiz
c82a288f87 avfilter/showcqt: add fontcolor option 2014-08-23 10:01:22 +02:00
Stefano Sabatini
7e4a4bda0e doc/filters/apad: extend documentation 2014-08-21 16:59:18 +02:00
Clément Bœsch
f5ddce0753 doc/APIChanges: fill 2 hashes from my recent API additions 2014-08-21 12:36:28 +02:00
Clément Bœsch
980a5b01fd avutil/motion_vector.h: fix coordinate types 
See b0352b1997 for more information on the
feature.
 2014-08-21 12:27:34 +02:00
Clément Bœsch
5abcc8e1a0 doc/filters: fix cline option name recently added 2014-08-20 22:30:38 +02:00