Commit Graph

79466 Commits

Author SHA1 Message Date
Michael Niedermayer
f07923253a avcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_per_raw_sample
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 17:58:05 +02:00
Michael Niedermayer
bcf936eaea avcodec/utils: Add braces to framecount computation
Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 15:48:02 +02:00
Michael Niedermayer
a7fa1e38ca avcodec/utils: Fix duration of ATRAC3 packets
Fixes ticket1680

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 15:03:27 +02:00
Benjamin Steffes
0cfe16437f lavfi/af_hdcd: Implement high definition audio cd filtering.
Fixes ticket #4441.
2016-04-15 12:14:55 +02:00
James Almer
bb505cd505 avformat/hashenc: simplify hash_write_trailer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-14 20:59:08 -03:00
Michael Niedermayer
21acc4db5f avcodec: Add bits_per_raw_sample to AVCodecParameters
The bits_per_raw_sample represents the number of bits of precision per sample.

The field is added at the logical place, not at the end as the code was just
recently added

This fixes the regression about losing the audio sample precision information

The change in the fate test checksum un-does the change from the merge

Previous version reviewed by: wm4 <nfxjfg@googlemail.com>
Previous version reviewed by: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-15 00:33:55 +02:00
James Almer
c8ed93efcf avformat/yop: alloc codecpar extradata only once
Fixes memleak

Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-14 15:55:10 -03:00
Paul B Mahol
9cd2ca9966 avcodec/ralf: add support for mono
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-14 22:31:57 +02:00
Paul B Mahol
c9fb81ff41 avcodec/atrac3: pass AVCodecContext to av_log if available
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-14 18:47:57 +02:00
Paul B Mahol
323b8c95e4 avformat: add AVFormatContext to ff_get_extradata()
Needed for av_log() inside that function.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-14 18:21:08 +02:00
Michael Niedermayer
8e26bdd59b avcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossing corner case
Fixes Ticket 5438

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-14 15:28:02 +02:00
Derek Buitenhuis
e1a8f7818c Merge commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b'
This commit is a no-op.

* commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b':
  takdec: ensure chan2 is a valid channel index

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 14:02:21 +01:00
Derek Buitenhuis
0520d573db Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'
* commit '9765549f551ff40869aee1a6492b6a976c86cfe9':
  mpegts: Forward the errors on mpeg4 objects parsing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 14:01:31 +01:00
Derek Buitenhuis
8688d3af39 Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'
* commit '07a844f32ebb78503981df017fa3ebfedb75fe1c':
  lavfi: generic hardware surface upload and download filters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 13:59:45 +01:00
Derek Buitenhuis
28abb216cb Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
  lavu: VAAPI hwcontext implementation

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 13:49:55 +01:00
Derek Buitenhuis
eb2da769bd Merge commit 'd264c720f7b74286840719e506daba39f83b438b'
* commit 'd264c720f7b74286840719e506daba39f83b438b':
  lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 13:46:00 +01:00
Derek Buitenhuis
afccfaf26a Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'
* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
  lavu: add a way to query hwcontext frame constraints

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 13:33:37 +01:00
Derek Buitenhuis
7af788aa62 Merge commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5'
* commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5':
  svq3: Use a separate buffer for decoding the slices

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-14 13:25:33 +01:00
James Almer
0efafc5849 avformat/framehash: enable new output
Also, make every addition except for sidedata part of version 1 instead of the
new version 2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-13 21:13:21 -03:00
James Almer
868bce48f6 avformat/framehash: add sidedata checksum
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-13 20:58:04 -03:00
Jan Sebechlebsky
2ea5ab6fc6 avformat/tee: Refactor close_slaves function in tee muxer
Closing single slave operation is pulled out into separate
function close_slave(TeeSlave*).
Both close_slave and close_slaves function are moved before
open_slave function.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-04-14 00:49:11 +02:00
Bryan Huh
949444348b avformat/dump: Fix sign bug in reported "start" time
Previously, the bug was that if -1 < start_time < 0, the reported
"start" time would lose the negative-sign.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-14 00:13:15 +02:00
Paul B Mahol
56759f69a6 avcodec/wmalosslessdec: improve 24bit support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-13 22:56:53 +02:00
Paul B Mahol
5ac71e9db8 avcodec/wmalosslessdec: improve >2 channel support
Before it worked for stereo files only.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-13 22:56:33 +02:00
Michael Niedermayer
3c0511f29e tests/checkasm/vf_colorspace: Make bpp_mask const
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-13 22:39:41 +02:00
Lou Logan
fa0f59d55d doc/demuxers: fix "Quicktme" typo
Signed-off-by: Lou Logan <lou@lrcd.com>
Found-by: furq
2016-04-13 10:41:42 -08:00
James Almer
5557e881c9 avformat/framehash: add extradata checksum
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-13 11:41:20 -03:00
James Almer
33aa8a6221 avformat/framecrc: enable new output
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-04-13 11:37:14 -03:00
Derek Buitenhuis
89ec4d46ee Merge commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361'
This commit is a no-op.

* commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361':
  cmdutils: update copyright year to 2016

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:35:40 +01:00
Derek Buitenhuis
e5bb7d98f8 Merge commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d'
This commit is a no-op.

* commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d':
  matroska: Support V_QUICKTIME as written in the specification

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:34:16 +01:00
Derek Buitenhuis
c182845068 Merge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'
* commit '92c1a83ee9394b39d68f6affd9104752a03714f8':
  qsv: Fix loading multiple plugins

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:31:36 +01:00
Derek Buitenhuis
bdd6275691 Merge commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328'
* commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328':
  mov: Check the entries value when parsing dref boxes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:30:47 +01:00
Derek Buitenhuis
37f4cdb937 Merge commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0'
* commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0':
  configure: Add support for clang llvm-cov

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:29:10 +01:00
Derek Buitenhuis
6e6b1fe7f7 Merge commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2'
* commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2':
  configure: Support msan as toolchain

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:28:44 +01:00
Derek Buitenhuis
c849ed8b2f Merge commit '328e9a15c568843580ff3ff490748d545f16def8'
* commit '328e9a15c568843580ff3ff490748d545f16def8':
  buffer: drop a reference to a non-existing function from the docs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:27:01 +01:00
Derek Buitenhuis
27558679a1 Merge commit '7480d001312d9ba706333ec970264ed9df3f82cb'
* commit '7480d001312d9ba706333ec970264ed9df3f82cb':
  pixfmt: fix the AV_PIX_FMT_VAAPI_VLD doxy

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:26:08 +01:00
Derek Buitenhuis
2691a8399f Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"
Broke a lot of stuff and didn't fix anything.

This reverts commit 3c461eecd4, reversing
changes made to 884dd175f0.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 17:11:10 +01:00
Derek Buitenhuis
f8b09e90e9 Merge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'
This commit is a no-op. Ours are not identical / refactorable.

* commit '39a2d3288e82e4e576c03efb32179ef5a19fff50':
  mpegvideo: Refactor emulated_edge_mc calls

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:31:35 +01:00
Derek Buitenhuis
d3e1c6f975 Merge commit '0242351390643d176b10600c2eb854414f9559e6'
* commit '0242351390643d176b10600c2eb854414f9559e6':
  mpegvideo: Fix undefined negative shifts in mpeg_motion_internal

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:29:12 +01:00
Derek Buitenhuis
c2f9f81650 Merge commit '7d4a1ff344cbf969ac648642a0fd8484fd5b8637'
This commit is a no-op. We solved it already.

* commit '7d4a1ff344cbf969ac648642a0fd8484fd5b8637':
  mpegvideo: Fix undefined negative shifts in ff_init_block_index

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:27:32 +01:00
Derek Buitenhuis
eff2b43117 Merge commit '1389b4c18d1042c196603ba66c25113bcee1738b'
This commit is a no-op.

* commit '1389b4c18d1042c196603ba66c25113bcee1738b':
  idct8x8: Fix undefined negative shifts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:25:22 +01:00
Derek Buitenhuis
09dc684566 Merge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'
* commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0':
  vdpau: Add missing deprecation guards

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:22:14 +01:00
Derek Buitenhuis
feb1f7abc5 Merge commit 'd40cb726d271b0284642a1ba159eb26a5c579f77'
* commit 'd40cb726d271b0284642a1ba159eb26a5c579f77':
  mov: Trim dref absolute path

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:21:12 +01:00
Derek Buitenhuis
e7ac968f60 Merge commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838'
This commit is a no-op.

[16:15] <@Daemon404> wm4, ping
[16:15] <@Daemon404> whats up with "avconv: remove sub-frame warning"
[16:15] <@Daemon404> it's in libav but not ours?
[16:15] <@Daemon404> mailing list bikeshedding?
[16:15] <@wm4> it's in ffmpeg.c too
[16:16] <@wm4> you can probably skip it for now
[16:16] <@wm4> michaelni was against removing it this way
[16:17] <@Daemon404> ok

* commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838':
  avconv: remove sub-frame warning

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:17:23 +01:00
Derek Buitenhuis
f5b93c46e9 Merge commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874'
This commit is a no-op.

* commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874':
  lavc: factor apply_param_change() AV_EF_EXPLODE handling

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:14:42 +01:00
Derek Buitenhuis
be6b58a981 Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'
* commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71':
  lavu: improve documentation of some AVFrame functions

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:11:39 +01:00
Derek Buitenhuis
3bf368a2a6 Merge commit '84b5dcf27589b32713a4ba0723a129156b4d2408'
This commit is a no-op.

* commit '84b5dcf27589b32713a4ba0723a129156b4d2408':
  asfenc: remove an unused variable

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:10:10 +01:00
Derek Buitenhuis
bfd0f42277 Merge commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90'
This commit is a no-op. As far as I can tell, we already added
checks, to address this CVE in 7c0b84d899,
which is also reflected in the CVE database:

    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2326

* commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90':
  asfenc: fix some possible integer overflows

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 16:08:44 +01:00
Derek Buitenhuis
3c461eecd4 Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'
* commit '1ceb07eb313c2d51383408025e57a2fe50ccd164':
  avformat_find_stream_info: move duration guessing after updating codec parameters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 15:36:55 +01:00
Derek Buitenhuis
884dd175f0 Merge commit '11843ededacd0157aea642771837557549b5b417'
* commit '11843ededacd0157aea642771837557549b5b417':
  fate: Add separate target for all indeo3 tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-13 15:20:53 +01:00