virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity
81,952 Commits 38 Branches 406 Tags
f71c98ee12f9a9e950b4a8fb6b1548fee91ba1f8
Commit Graph

81952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moritz Barsnick
f71c98ee12 tools: fix grammar error 
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-09 20:09:00 +02:00
Michael Niedermayer
7ba7b96dd3 doc/examples/http_multiclient: Fix "doc/examples/http_multiclient.c:43:9: warning: passing argument 4 of av_opt_get from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-09 00:32:39 +02:00
Hendrik Leppkes
3e5e5bdfef Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc' 
* commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc':
  avconv: buffer the packets written while the muxer is not initialized

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-08 11:38:47 +02:00
James Almer
c45ba265fc avformat/matroskaenc: fix Tags master on seekable output if there are tags after the last stream duration 
The dynamic AVIOContext would get closed pointing to the wrong position
in the buffer.
This is a regression since 650e17d88b.

Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-07 16:46:45 -03:00
Michael Niedermayer
72061177f3 ffmpeg: Fix bitstream typo 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-07 16:10:10 +02:00
Hendrik Leppkes
ab7e83efed ffmpeg: explicitly write headers for files with no streams 
Recent changes to ffmpeg.c tied output file init to stream init, which broke
stream-less files, specifically ffmetadata output.
 2016-10-07 16:02:14 +02:00
Michael Niedermayer
572f16e100 avformat/matroskaenc: Fix () error 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-07 14:56:53 +02:00
Hendrik Leppkes
82c4d57553 Merge commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527' 
* commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527':
  avconv: explicitly postpone writing the header until all streams are initialized

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 14:39:00 +02:00
Hendrik Leppkes
adfcf16f76 Merge commit '5b63b15663d31f50ce45d980b904a68795ad3f7a' 
* commit '5b63b15663d31f50ce45d980b904a68795ad3f7a':
  lavfi: set the link hwframes context before configuring the dst input

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:29:11 +02:00
Hendrik Leppkes
85146dfc23 Merge commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af' 
* commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af':
  omx: Don't return > 0 from omx_encode_frame

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:28:53 +02:00
Hendrik Leppkes
edb4c44511 Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4' 
* commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4':
  libopenh264enc: Fix inconsistent whitespace

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:23:49 +02:00
Hendrik Leppkes
2335e189fb Merge commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad' 
* commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad':
  msmpeg4: Remove commented-out debug logging code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:23:38 +02:00
Hendrik Leppkes
5114c62902 Merge commit 'eedbeb4c2737f28844157fae4bd87ed42a61bb1d' 
* commit 'eedbeb4c2737f28844157fae4bd87ed42a61bb1d':
  msmpeg4: Remove some broken, commented-out cruft

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:22:25 +02:00
Hendrik Leppkes
da76175d68 Merge commit '3c84eaae9da0dc450ae99c65bb6b9865e3ba7fad' 
* commit '3c84eaae9da0dc450ae99c65bb6b9865e3ba7fad':
  h264: Eliminate unused but set variable

Noop, the variable doesn't exist in our code.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:21:51 +02:00
Hendrik Leppkes
8dd0e3d50f Merge commit '4dbfcd07570a9e45e9597561023adb6da26f27f6' 
* commit '4dbfcd07570a9e45e9597561023adb6da26f27f6':
  librtmp: Avoid an infiniloop setting connection arguments

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:20:04 +02:00
Hendrik Leppkes
e8487d71be Merge commit 'fe498ef5144d3712b887f44a0c5e654add99ead7' 
* commit 'fe498ef5144d3712b887f44a0c5e654add99ead7':
  hwcontext_vaapi: Return all formats for constraints without config

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:19:53 +02:00
Hendrik Leppkes
5e872d9083 Merge commit '11b8030309ee93d79b3a6cd4b83bf00757db1598' 
* commit '11b8030309ee93d79b3a6cd4b83bf00757db1598':
  vaapi_encode: Fix fallback when input does not match any format

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:19:32 +02:00
Hendrik Leppkes
40b2878ad3 Merge commit '8c3c7b8920033d61c7aa15a4465b759c84e5958f' 
* commit '8c3c7b8920033d61c7aa15a4465b759c84e5958f':
  dxva2_h264: Remove an unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:19:06 +02:00
Hendrik Leppkes
6fc74934de Merge commit 'dc7501e524dc3270335749302c7aa449973625f3' 
* commit 'dc7501e524dc3270335749302c7aa449973625f3':
  checkasm: Issue emms after benchmarking functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:18:05 +02:00
Hendrik Leppkes
6f74e3cde6 Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c' 
* commit 'beb62dac629603eb074a44c44389c230b5caac7c':
  Use AVFrame.pts instead of deprecated pkt_pts.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:16:36 +02:00
Hendrik Leppkes
3f9137c57d Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27' 
* commit '32c8359093d1ff4f45ed19518b449b3ac3769d27':
  lavc: export the timestamps when decoding in AVFrame.pts

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-10-07 13:03:36 +02:00
Hendrik Leppkes
04a3577263 ffmpeg: remove unused and errorneous AVFrame timestamp check 
Decoders have previously not used AVFrame.pts, and with the upcoming
deprecation of pkt_pts (in favor of pts), this would lead to an errorneous
interpration of timestamps.
 2016-10-07 12:21:18 +02:00
Rodger Combs
0212867202 tests: add -nostdin flag when calling ffmpeg 
This fixes a long-standing issue where running FATE in parallel could result
in the terminal being left misconfigured, particularly if a test failed or
was canceled wtih ^C.
 2016-10-06 18:31:07 -05:00
Rodger Combs
1f7d586052 ffmpeg: don't reconfigure terminal if we're not taking input from stdin 2016-10-06 18:31:06 -05:00
James Almer
711bfb33df avformat/matroskaenc: add an option to disable writting CRC32 elements 
Also add missing Changelog entry.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 18:42:10 -03:00
James Almer
3bcadf8227 avformat/matroskaenc: write a CRC32 element on Info 
Finishes implementing ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 17:16:12 -03:00
James Almer
650e17d88b avformat/matroskaenc: write a CRC32 element on Tags 
Implements part of ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 17:13:59 -03:00
James Almer
4687240d52 avformat/matroskaenc: write a CRC32 element on Attachments 
Implements part of ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 17:10:51 -03:00
James Almer
eccefece61 avformat/matroskaenc: write a CRC32 element on Chapters 
Implements part of ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 17:08:14 -03:00
James Almer
87ce2595de avformat/matroskaenc: write a CRC32 element on Tracks 
Implements part of ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 17:05:03 -03:00
James Almer
79248795d4 avformat/matroskaenc: write a CRC32 element on Cues 
Implements part of ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 17:01:20 -03:00
James Almer
3b189fae73 avformat/matroskaenc: write a CRC32 element on SeekHead 
Implements part of ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 16:59:09 -03:00
James Almer
6724525a15 avformat/matroskaenc: write a CRC32 element on each Cluster 
Implements part of ticket #4347

Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 16:54:07 -03:00
James Almer
4e3bdf729a avformat/matroskaenc: always use a dynamic buffer when writting clusters 
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 16:30:56 -03:00
James Almer
d41aeea8a6 avformat/matroskaenc: print debug message with cluster offsets only if the output is seekable 
Printing the dynamic buffer offset is useless.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 16:30:56 -03:00
James Almer
a4044498f7 avformat/matroskadec: check for more reserved values on some Colour elements 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 13:49:29 -03:00
James Almer
9b8ac526f6 avformat/matroskaenc: don't write an empty Colour master element 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-06 13:49:10 -03:00
Carl Eugen Hoyos
d2af93ac16 configure: Also try -mstack-alignment for clang, 
Fixes stack alignment on x86_32 FreeBSD.
Fixes ticket #5231.
 2016-10-06 18:44:29 +02:00
Matthieu Bouron
0919151651 lavc/mediacodecdec: fix size variable shadowing in ff_mediacodec_dec_decode 
Fixes incompatible pointer type warning on 64-bit systems.
 2016-10-06 16:49:28 +02:00
Nablet Developer
8d858674fd avcodec/qsvenc_h264: fix segfault when a53 SEI is not available 
Signed-off-by: Nablet Developer <sdk@nablet.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-06 14:01:40 +02:00
Rodger Combs
a6bce3ca90 lavf/utils: avoid using programs for duration when there's only one 
This allows us to be more selective about the streams we derive durations from
(specifically, ignoring text streams with outlier end times) in the common case
 2016-10-06 01:36:05 -05:00
Rodger Combs
4c9c4fe8b2 lavf/utils: ignore outlier subtitle and data stream end times as well 2016-10-06 01:36:05 -05:00
Timothy Gu
54220ce731 pixfmt: Use enum assignment for aliases 
This way, Doxygen is happier as aliases are now grouped together, and
it never handled #define's in an enum well in the first place.

Y400A already exists as an enum assignment.
 2016-10-05 17:17:50 -07:00
Timothy Gu
bdcd586c0d pixdesc: Order function prototypes semantically 2016-10-05 17:17:50 -07:00
Shivraj Patil
c1cc13cd2a avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6 
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-05 23:44:03 +02:00
Florian Diemer
db4c1bee96 avformat/riffenc: added possibility to set first to ninth audio language for RIFF taged files (e.g. avi files) 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-05 23:38:21 +02:00
Burt P
2c3d936487 af_hdcd: disable auto-convert by default 
As all known valid HDCD sample formats and sample rates are now handled
by the filter, remove the scan that "invades the privacy" of the filter graph
and turn off autoconvert by default as requested by Nicolas George.

http://ffmpeg.org/pipermail/ffmpeg-devel/2016-August/197571.html

Signed-off-by: Burt P <pburt0@gmail.com>
 2016-10-05 12:52:56 -05:00
Burt P
f51ddbf83c af_hdcd: add experimental 20 and 24-bit decoding support 
I don't have any legitimate 20 or 24-bit HDCD to test. It is known
that the PM Model Two would insert packets into 20 and 24-bit output,
but I have no idea what differences in behavior existed when decoding
20 or 24-bit. For now, as with 16-bit, PE (if enabled) will expand the
top 3dB into 9dB and LLE (gain adjust) will be applied if signaled.

Signed-off-by: Burt P <pburt0@gmail.com>
 2016-10-05 12:48:59 -05:00
Burt P
4f94f01414 af_hdcd: hdcd_scan() and hdcd_integrate() handle stereo and single channel 
New versions of hdcd_scan() and hdcd_integrate() that also do the
work of hdcd_scan_stereo() and hdcd_integrate_stereo().

Some code split into previously separate functions to remove
duplication is now merged back into each function in the single
place where it is used.

Signed-off-by: Burt P <pburt0@gmail.com>
 2016-10-05 12:39:52 -05:00
Burt P
80d89c1960 af_hdcd: support s16p (WavPack) directly 
The buffer is already being copied anyway, so interlace the planar
format during the copy and remove one use of auto-convert.

Signed-off-by: Burt P <pburt0@gmail.com>
 2016-10-05 12:38:26 -05:00