virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
66,507 Commits 39 Branches 425 Tags
f183febcdafb9f59d24afa752461a4d62e3bcf93
Commit Graph
66507 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch a87527ad67 avfilter/ass: make sure the log level are in available range 2014-09-16 21:23:33 +02:00
Michael Niedermayer 7d43fbe3ae Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce' 
* commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce':
  dca: K&R formatting cosmetics

Conflicts:
	libavcodec/dca_parser.c
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 20:31:02 +02:00
Michael Niedermayer 9bf260b2d2 Merge commit '9030c58a780a02fb8256cb75cd39275eaad786d1' 
* commit '9030c58a780a02fb8256cb75cd39275eaad786d1':
  configure: Disable i686 for i586 and lower CPUs

See: cdb3eee7c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 20:08:21 +02:00
Diego Biurrun 2dd09ebf55 cmdutils: Print a more sensible message in show_filters() w/o libavfilter 
Also avoid an unused variable warning for compilers w/o av_unused support.
 2014-09-16 09:37:14 -07:00
Michael Niedermayer a07b0ffdc3 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Add a closing LF to Webm-manifest files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 18:28:37 +02:00
Michael Niedermayer 4a99134f1a tools/crypto_bench: fix build when AV_READ_TIME is unavailable 
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 18:25:43 +02:00
Carl Eugen Hoyos 7c3ba1b83a Add a closing LF to Webm-manifest files. 
Fixes fate-webm-dash-manifest on AIX.

Reviewed-by: Nicolas George
 2014-09-16 17:24:56 +02:00
Clément BœschandClément Bœsch d469aa8cfa sws: use av_clip() instead of av_clip_c() 2014-09-16 16:57:20 +02:00
Clément BœschandClément Bœsch de0e49c245 avformat/flacenc: use av_clip() instead of av_clip_c() 2014-09-16 16:57:20 +02:00
Steven LiuandStefano Sabatini 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
Gabriel DumeandDiego Biurrun 45ff7c93dd dca: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-09-16 04:42:32 -07:00
Mikulas PatockaandDiego Biurrun 9030c58a78 configure: Disable i686 for i586 and lower CPUs 2014-09-16 03:48:13 -07:00
Michael Niedermayer 5ddfac81c4 Merge commit '2d589273dd36c5eb271a035ea0e669b64dae257f' 
* commit '2d589273dd36c5eb271a035ea0e669b64dae257f':
  configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 11:58:40 +02:00
Diego Biurrun 2d589273dd configure: Split adding of CFLAGS and CPPFLAGS for hardened toolchain 2014-09-16 00:18:53 -07:00
Michael Niedermayer 688a40b4ed avcodec/h264_sei: ff_h264_decode_sei: dont try to parse trailing zeroes 
reduces noise for tserrors.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 04:07:22 +02:00
Michael Niedermayer aaeae281a8 avformat/mpegtsenc: More verbose warning messages in case of missing video ES startcodes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 03:56:37 +02:00
Michael Niedermayer b76d6132e3 avformat/network: move sockaddr_union after sockaddr_storage compatibility code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-16 01:19:53 +02:00
Clément BœschandClément Bœsch 864d124bb7 build: simplify libwebp check 
Tested (compilation and runtime) with libwebp 0.2.0, 0.2.1 and 0.4.1.
 2014-09-15 23:54:34 +02:00
Michael Niedermayer 2156161056 Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc' 
* commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc':
  ismindex: handle time discontinuities and nonzero start time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-15 22:39:31 +02:00
Mika RaentoandMichael Niedermayer 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
James Almer ad1dadac86 avfilter: remove obsolete FF_API_BUFFERSRC_BUFFER cruft 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-15 15:54:06 -03:00
James Almer 95a064f530 avutil: remove obsolete FF_API_OLD_OPENCL cruft 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-15 15:50:17 -03:00
James Almer af7d260626 avutil: remove obsolete FF_API_LLS1 cruft 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-15 15:50:10 -03:00
Mika RaentoandMartin Storsjö 00431bf874 ismindex: handle time discontinuities and nonzero start time 
The input file may not have consistent start times, stream durations and
chunk durations. This patch at least removes negative durations that
make chromecast unhappy, and correctly sets starting time on chunks so
that the split (or .ismf) outputs match the manifest.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-09-15 19:54:36 +03:00
James Almer 4ae6bcc025 RELEASE: update to 2.4.git 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-15 13:11:10 -03:00
Michael Niedermayer e587a428d7 avformat/rtpproto: fix strict aliasing violations with sockaddr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-15 13:31:00 +02:00
Michael Niedermayer 8c1dc1f6ed avformat/network: add union for avoiding strict aliassing violations with sockaddr* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-15 13:31:00 +02:00
James Almer 91459bd320 avcodec: remove obsolete FF_API_DSPUTIL cruft 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-09-14 22:13:05 -03:00
Michael Niedermayer 6beea6f017 avcodec/tiff: fix odd dimensioned yuv 
Fixes Ticket3893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-15 01:38:02 +02:00
Deb MukherjeeandMichael Niedermayer 04b0dda853 avcodec/libvpxdec: Adds decode support for formats other than 420 
Handles decoding of new VP9 profiles 1-3 with different color sampling
and bit-depths.

For high bitdepth (profiles 2 and 3) support, we currently need to link
with the highbitdepth branch of libvpx with --enable-experimental
and --enable-vp9-high config options on. But eventually this branch will
be merged into master, whereafter to enable high bitdepth
support you will need to link with libvpx with configure option
--enable-vp9-highbitdepth on.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 20:27:28 +02:00
Clément Bœsch b24d74e44a avcodec/microdvddec: indent fix 2014-09-14 20:00:11 +02:00
Clément Bœsch fcfa3ebed1 avcodec/utils: remove avcodec_ prefix for internal symbol 2014-09-14 19:07:09 +02:00
Michael Niedermayer b227be34db avcodec/mjpegenc: the AMV encoder doesnt support yuv422 
Fixes Ticket3883

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 17:09:38 +02:00
Michael Niedermayer 808db3e687 Changelog: add 2.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 16:47:26 +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 da2186be81 MAINTAINERS: Add 2.4 to maintained releases, drop 2.3 
2.2 is used by 4 distributions, 2.3 by none, thus continuing maintaining
2.2 makes more sense than 2.3 see:
https://trac.ffmpeg.org/wiki/Downstreams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
n2.5-dev 		2014-09-14 16:00:00 +02:00
Clément Bœsch 5eef7042d8 Changelog/RELEASE_NOTES: prepare for 2.4 2014-09-14 13:41:49 +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œschandMichael Niedermayer 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 CadhalpunandMichael Niedermayer 365b9cf624 doc: mention important API changes in the RELEASE_NOTES 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 03:09:35 +02:00
Reynaldo H. Verdejo Pinochet 2638af2fc5 ffserver: drop custom skip_spaces() impl 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-13 21:01:01 -03:00
Reynaldo H. Verdejo Pinochet 4c8be331bc ffserver: use correct error for stream not found 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2014-09-13 21:01:01 -03:00
Andreas CadhalpunandMichael Niedermayer 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
Michael Niedermayer 5312fb13b4 RELEASE_NOTES: add version numbers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-14 00:14:58 +02:00
Michael Niedermayer c2a7607a1c RELEASE_NOTES: Add next versions name (Fresnel) 
The name is "randomly" picked from previous suggestions
If people prefer something else, suggest it quickly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-13 23:51:00 +02:00
Michael Niedermayer 36ea35bbc0 avformat/utils: free s->pb for image2 as it can be used with and without a file 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-13 23:25:17 +02:00
Clément Bœsch 89d42da5c6 avformat/assenc: honor ReadOrder 2014-09-13 23:02:51 +02:00
Michael Niedermayer 52c85b194b avdevice/lavfi: dont assign variables to themselfs 
Fixes "warning: explicitly assigning a variable of type int to itself"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-13 22:32:21 +02:00
Michael Niedermayer 8407cbbfc9 Fix "passing argument 1 of av_free discards const qualifier from pointer target type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-13 22:32:20 +02:00