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
78,749 Commits 37 Branches 400 Tags 465 MiB
2941282124
Commit Graph

78749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Buitenhuis
899e19f177 Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd' 
* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd':
  lavc: Move rtp_payload_size to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-31 13:19:50 +00:00
Derek Buitenhuis
9938697c1c Merge commit 'd749615333084e62c9fcc480d1ae466369fdf14f' 
* commit 'd749615333084e62c9fcc480d1ae466369fdf14f':
  lavc: Move timecode_frame_start to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-31 12:28:04 +00:00
Paul B Mahol
b4af7d68fe avcodec/fraps: remove superfluous "Fraps:" from av_log 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-31 12:59:28 +01:00
Paul B Mahol
0c28aa6ddc doc/filters.texi: fix typo in spectrumsynth example 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-31 11:21:58 +01:00
Michael Niedermayer
6ffac5d33d avcodec/rawdec: Switch to monowhite if there is no palette & bpp=1 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 04:36:53 +01:00
Michael Niedermayer
77864be44a avformat/format: Weight the filename extension higher if there is nearly no data after an ID3 available 
Fixes Ticket5205

Based-on-patch-by: Carl Eugen Hoyos
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-30 22:25:31 +01:00
Michael Niedermayer
8619582bdf avformat/format: Replace nodat by enum 
This makes the code much more readable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-30 22:25:31 +01:00
Kieran Kunhya
32bf4a72e3 avcodec: Add forgotten minor bump, add Changelog and add Cineform to general.texi 2016-01-30 18:09:36 +00:00
Kieran Kunhya
3485332bf9 avcodec: Cineform HD Decoder 
Decodes YUV 4:2:2 10-bit and RGB 12-bit files.
Older files with more subbands, skips, Bayer, alpha not supported.
Alpha requires addition of GBRAP12 pixel format.
 2016-01-30 17:44:13 +00:00
Carl Eugen Hoyos
31f5fa21b0 lavc/exr: Move setting SAR down. 
Fixes a theoretical issue if the resolution attribute is written
behind the aspect attribute.
 2016-01-30 13:38:16 +01:00
Carl Eugen Hoyos
d391feff54 lavc/v210dec: Allow odd width. 
The rightmost column is not decoded correctly.

Fixes a part of ticket #5195.
 2016-01-30 13:31:44 +01:00
Carl Eugen Hoyos
0275b2d917 Changelog: Sanitize Common Encryption entries. 2016-01-30 13:30:29 +01:00
Clément Bœsch
54ab90c05b lavc/utils: fix instanciate/instantiate typo 2016-01-30 13:10:11 +01:00
Clément Bœsch
d3d03fd55e lavf/vqf: fix suported/supported typo 2016-01-30 13:08:37 +01:00
Stephen Hutchinson
0dd201d947 libx265: Remove experimental flag when encoding 4:2:2 and 4:4:4 
4:2:2 and 4:4:4 support in the HEVC standard was approved in
October 2014 as part of HEVC Version 2 and published in
January 2015:

http://www.itu.int/ITU-T/recommendations/rec.aspx?rec=12296
http://www.itu.int/rec/T-REC-H.265-201410-S
https://hevc.hhi.fraunhofer.de/rext

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-30 12:29:29 +01:00
Kieran Kunhya
e07e88cd82 avcodec: Remove libvo-aacenc support. 
The internal encoder is superior to libvo-aacenc.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2016-01-29 17:26:42 -08:00
Timothy Gu
9ba54c1b82 avcodec: Remove libaacplus 
TODO: bump minor

It's inferior in quality to fdk-aac and has an arguably more problematic
license.

As early as 2012, a HydrogenAudio user reported:

> It has however one huge advantage: much better quality at low bitrates than
> faac and libaacplus.

(https://hydrogenaud.io/index.php?PHPSESSID=ckiq394pdglka0kj2fin6ij8t7&topic=95989.msg804633#msg804633)

I myself have made a few spectrograms for a comparison of the two
encoders as well. The FDK output is consistently better than the
libaacplus one, in all bitrates I tested.

libaacplus license is 3GPP + LGPLv2. 3GPP copyright notice is completely
proprietory, as follows:

> No part may be reproduced except as authorized by written permission.
>
> The copyright and the foregoing restriction extend to reproduction in
> all media.
>
> © 2008, 3GPP Organizational Partners (ARIB, ATIS, CCSA, ETSI, TTA, TTC).
>
> All rights reserved.

(The latest 26410-d00 zip from 3GPP has the same notice, but the copyright
year is changed to 2015)

The copyright part of the FDK AAC license (section 2) is a copyleft
license that permits redistribution under certain conditions (and
therefore the LGPL + libfdk-aac combination is not prohibited by
configure):

> Redistribution and use in source and binary forms, with or without
> modification, are permitted without payment of copyright license fees
> provided that you satisfy the following conditions:
>
> You must retain the complete text of this software license in
> redistributions of the FDK AAC Codec or your modifications thereto in
> source code form.
>
> You must retain the complete text of this software license in the
> documentation and/or other materials provided with redistributions of
> the FDK AAC Codec or your modifications thereto in binary form.
>
> You must make available free of charge copies of the complete source
> code of the FDK AAC Codec and your modifications thereto to recipients
> of copies in binary form.
>
> The name of Fraunhofer may not be used to endorse or promote products
> derived from this library without prior written permission.
>
> You may not charge copyright license fees for anyone to use, copy or
> distribute the FDK AAC Codec software or your modifications thereto.
>
> Your modified versions of the FDK AAC Codec must carry prominent
> notices stating that you changed the software and the date of any
> change. For modified versions of the FDK AAC Codec, the term
> "Fraunhofer FDK AAC Codec Library for Android" must be replaced by the
> term "Third-Party Modified Version of the Fraunhofer FDK AAC Codec
> Library for Android."
 2016-01-29 17:14:37 -08:00
James Almer
5893e87537 avcodec/proresdec_lgpl: use av_mod_uintp2 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-29 19:58:44 -03:00
James Almer
1bb3b90db8 avcodec/pngdec: use av_mod_uintp2 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-29 19:58:41 -03:00
James Almer
8514f6dcfd avcodec/amrwbdec: use av_mod_uintp2 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-29 19:58:34 -03:00
Thierry Foucu
9a09952695 lavf/flvdec: Allow files where the PreviousTagSize is not set according to the spec. 
Some muxer use the FLV field PreviousTagSize to be the sum of tag
length. Without this change, the flv demuxer think the file is broken
and the re-sync will fail.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-29 22:30:12 +01:00
Hagen Schmidt
583a643146 mpegtsenc: Do not fail ADTS AAC muxing if the first frame is not ADTS 
Fixes ticket 279.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-29 21:40:33 +01:00
Zhao Zhili
1e2c262212 libavformat/network: use defined constant in poll 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-29 21:31:47 +01:00
Michael Niedermayer
8fac0d6403 avformat/avio: free url/avio options 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-29 19:23:02 +01:00
Neil Birkbeck
c323c98ee3 libavutil/mastering_display_metadata.h: change fields to be rationals as this is how they are typically coded. 
(this structure is not referenced anywhere yet)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-29 19:08:52 +01:00
James Almer
6cc156793d avcodec/dvaudio: add missing header include 
Should fix make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-29 13:57:15 -03:00
Mats Peterson
b34c9d1b9d lavc/rawdec: Use AV_PIX_FMT_PAL8 for raw 1 bpp video in AVI 
From
https://msdn.microsoft.com/en-us/library/windows/desktop/dd318229%28v=vs.85%29.aspx:

"If biCompression equals BI_RGB and the bitmap uses 8 bpp or less, the
bitmap has a color table immediatelly following the BITMAPINFOHEADER
structure. The color table consists of an array of RGBQUAD values. The
size of the array is given by the biClrUsed member. If biClrUsed is
zero, the array contains the maximum number of colors for the given
bitdepth; that is, 2^biBitCount colors."

Nothing about "monochrome" here. Unfortunately, pal8 to monow conversion
seems a bit flaky, but that's another story.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-29 14:52:30 +01:00
Michael Ira Krufky
44a50feebe libavdevice/decklink_common.h: fix broken build due to missing / 
Signed-off-by: Michael Ira Krufky <mkrufky@linuxtv.org>
 2016-01-29 13:29:47 +01:00
Michael Niedermayer
2d163cbdab avcodec/huffyuvenc: Remove duplicate include 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-29 12:33:22 +01:00
Stefano Sabatini
b91093a411 ffmpeg: replace "flush Media" with "flush_media" in benchmark_all output 
Simplify parsing and consistency.
 2016-01-29 10:58:18 +01:00
Timothy Gu
e74378aa8c amrwbdec_mips: Add missing ff_ prefix 2016-01-28 19:49:51 -08:00
Timothy Gu
44304ae322 all: Add missing header guards 2016-01-28 19:49:48 -08:00
Marton Balint
6bc610b39e configure: remove libzvbi GPL dependency 
The COPYING.LIB file in the zvbi source tree as well as libzvbi.h references
the GNU Library General Public License version 2 since version 0.2.28.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-29 01:42:17 +01:00
Marton Balint
995c7a6f5a lavd/decklink_dec: add support for teletext 
It uses the libzvbi slicer, therefore teletext capture requires libzvbi.

Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-29 01:42:15 +01:00
Marton Balint
98e94dff7a configure: use -ldl for decklink 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-29 01:41:54 +01:00
Marton Balint
cfc040a49f lavf: bump micro version after the new segment muxer options 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-29 01:41:09 +01:00
Marton Balint
369a6a6ed4 lavf/segment: add new option segment_clocktime_wrap_duration 
This option can force the segmenter to only start a new segment if a packet
reaches the muxer within the specified duration after the segmenting clock
time, which makes it more resilient to backward local time jumps, such as leap
seconds or transition to standard time from daylight savings time.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-28 21:35:44 +01:00
Marton Balint
1036a1b8a3 lavf/segment: add support for specifying clock time offset 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-28 21:35:37 +01:00
Vittorio Giovara
b340bd8a58 libx264: Make sure to preserve default option values 
The private options chromaoffset, sc_threshold, and noise_reduction
were set to 0 rather than -1, and were always initializing values
in libx264 rather than letting the library use its default.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-28 18:45:40 +01:00
Michael Niedermayer
cb06be6136 avcodec/libx264: Fix sc_threshold after 30c1bdb87c 
After the merge the default threshold was unconditionally overwritten

A similar fix was written by Vittorio Giovara, but i didnt see that before
i wrote this and it also doesnt apply cleanly

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-28 18:25:56 +01:00
Derek Buitenhuis
1a2d6055be avcodec/frame_thread_encoder: Check the private option for huffy's context modelling 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 17:19:06 +00:00
Derek Buitenhuis
5b0d4c247a Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589' 
* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
  lavc: Move context_model to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 16:57:04 +00:00
Derek Buitenhuis
0e3e3656d3 Merge commit '12b49769223234673db1003d9c43e7483ceb0282' 
* commit '12b49769223234673db1003d9c43e7483ceb0282':
  lavc: Move mpeg_quant to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 16:44:59 +00:00
Derek Buitenhuis
b986a4625d Merge commit '1482aff2048511b821ff9feac19426113cc641a2' 
* commit '1482aff2048511b821ff9feac19426113cc641a2':
  lavc: Move noise_reduction to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 16:42:32 +00:00
James Almer
c792528970 x86/imdct36: use extractps inside the STORE macro 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-28 13:35:15 -03:00
wm4
14a90c9ef0 mmaldec: limit internal buffering 
This uses a new MMAL feature, which limits the number of extra frames
that can be buffered within the decoder. VIDEO_MAX_NUM_CALLBACKS can
be defined as positive or negative number. Positive numbers are
absolute, and can lead to deadlocks if the user underestimates the
number of required buffers. Negative numbers specify the number of extra
buffers, e.g. -1 means no extra buffer, (-1-N) means N extra buffers.

Set a gratuitous default of -11 (N=10). This is much lower than the
firmware default, which appears to be 96.

This is backwards compatible, but needs a symbol only present in newer
firmware headers. (It's an enum item, so it requires a check in
configure.)
 2016-01-28 17:24:53 +01:00
wm4
7b1b53f3a4 mmaldec: support MPEG-4 
I guess this means part 2 in both cases. Not sure which profiles exactly
are actually supported properly.
 2016-01-28 17:24:40 +01:00
wm4
d27a12cb09 mmaldec: print the MMAL format FourCC automatically 
Slight simplification. The result is the same. Also, change the
wording of the message as requested in patch review.
 2016-01-28 17:23:46 +01:00
wm4
0badf4564a configure: fix mmal build dependencies 
The mmal decoders do not depend on the software decoders.
 2016-01-28 17:23:23 +01:00
Derek Buitenhuis
e8c5d5f429 snow: Move scenechange_threshold to a private option 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 15:36:06 +00:00