generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
79,524 Commits 24 Branches 241 Tags 173 MiB
db7d0d6e7c
Commit Graph

18922 Commits

Author SHA1 Message Date
Derek Buitenhuis
8f540b8612 Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8' 
* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
  build: Add component for the SRTP common code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-17 19:39:57 +01:00
Derek Buitenhuis
dff9894acd Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc' 
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc':
  nuv: Use the correct context for av_image_check_size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-17 19:06:18 +01:00
Derek Buitenhuis
af9cac1be1 Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab' 
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
  lavc: add a new bitstream filtering API

Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-17 18:47:40 +01:00
James Almer
b63ba3a517 avformat/hashenc: add missing avio_flush to hash_write_trailer 
It was accidentally deleted in the previous hashenc commit

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-04-16 21:31:58 -03:00
Michael Niedermayer
c4fad02779 avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again 
Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-16 02:01:10 +02:00
Carl Eugen Hoyos
a676c29af5 lavf/bink: Cosmetics: Reindent after last commit. 2016-04-15 21:26:04 +02:00
Carl Eugen Hoyos
6d39132fd4 lavf/bink: Support Monkey Island 4 (SMUSH) files. 
Fixes ticket #5410.
 2016-04-15 21:22:10 +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
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
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
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
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
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
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
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
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
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
James Almer
3674a53d17 avformat/uncodedframecrc: fix incompatible pointer type warning 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-04-13 01:39:59 -03:00
Michael Niedermayer
e3111b1ff8 avformat/framehash: Add more information to the output 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-04-12 11:18:57 -03:00
Moritz Barsnick
f4a0236cbd avformat: add hash and framehash muxers 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-04-12 11:18:52 -03:00
Michael Niedermayer
196cfc278d avformat/utils: use av_codec_g/set_lowres() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-12 04:21:12 +02:00
Timo Rothenpieler
901b0f1a21 avformat/concatdec: Use correct stream count on close 2016-04-11 21:06:10 +02:00
Derek Buitenhuis
6586f62d1a Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc' 
* commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc':
  lavf: add a missing bump and APIchanges for the codecpar switch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:09:00 +01:00
Derek Buitenhuis
8a1c79024d Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710' 
* commit 'fa55addd23c2f168163175aee17adb125c2c0710':
  img2: Drop av_ prefix for a static function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:59:58 +01:00
Michael Niedermayer
15fa01786c avformat/hdsenc: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer
0c9ad94e97 avformat/dashenc: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer
4104f18358 avformat/segment: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Derek Buitenhuis
6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 20:59:55 +01:00
Carl Eugen Hoyos
7e1e25c2dc lavf/avio: Remove linebreak from https warning. 2016-04-10 15:39:13 +02:00
Michael Niedermayer
38a6242b27 avformat/mpegts: Remove unused argument from analyze() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-10 13:32:26 +02:00
Michael Niedermayer
ee7a642b0e avformat/mpegts: Check adaption field control in analyze() more instead of transport_error_indicator 
transport_error_indicator is not required to be 0

Fixes probing
Fixes Ticket 4862

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-10 13:32:25 +02:00
Carl Eugen Hoyos
b0c026a27f lavf/rawenc: Add a raw gsm muxer. 2016-04-09 11:44:50 +02:00
Carl Eugen Hoyos
56cb465b38 lavf/gsmdec: Add raw gsm autodetection. 
Fixes bug 555.
 2016-04-09 11:38:46 +02:00
Paul B Mahol
a4790e1890 avformat/nistshperedec: add support for mu-law as sample-byte-format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 22:34:38 +02:00
Paul B Mahol
259879d32d avformat/nistspheredec: fix silly bug 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-08 13:19:00 +02:00
Paul B Mahol
0c9490609d avformat: support shorten in nistshpere demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-07 22:15:41 +02:00
Paul B Mahol
2d720069a9 avformat: add aix demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-07 09:08:53 +02:00
Paul B Mahol
56a3a3f01c avformat: add musx demuxer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-05 10:49:34 +02:00
Paul B Mahol
76466ab214 avformat/brstm: lower magic number, fixes decoding of some files 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-03 19:20:44 +02:00
Hendrik Leppkes
6518cbc52a lavc/utils: Introduce ff_bprint_to_codecpar_extradata for avformat 
It will be used by text subtitle demuxers to construct format instructions
straight into extradata. They all currently a similar function that accepts
an AVCodecContext instead.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-03 13:04:17 -04:00
Michael Niedermayer
06c4ed0c0e avformat/wavdec: fix typo with len 
Found-by: carl
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-03 17:56:02 +02:00
Michael Niedermayer
cf4d050b72 avformat/wavdec: Remove direct s->pb->buffer access 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-03 03:25:28 +02:00
Derek Buitenhuis
fcbdc44f4e wavdec: Only set the codec ID in read_header 
WAV is not a NOHEADER format, and thus should not be changing
stream codec IDs and probing in read_packet.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-03 01:55:57 +02:00
Rodger Combs
4b150fbe1f lavf/segment: add option to write empty filler segments as needed 2016-04-02 13:31:26 -05:00
Rodger Combs
5b4f44f66a lavf/segment: slight refactor to seg_write_packet 
This reduces some code duplication, and ensures that cur_entry.last_duration is
always set.
 2016-04-02 13:31:26 -05:00
Rodger Combs
44a9395b5a lavf/segment: style nit 2016-04-02 13:31:26 -05:00