wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
79689 commits 40 branches 405 tags 230 MiB
Commit graph

18954 commits

Author SHA1 Message Date
Александр Слободенюк
688664e02d avformat/riff: support for matrox m703 mpeg-2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 02:30:59 +02:00
Piotr Bandurski
55e6323090 avformat/riff: assign g721 and g723 codec tags to g726 decoder 2016-04-28 00:01:35 +02:00
Nicolas George
0cb19c30c6 lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf. 
Fix remuxing H.264-in-MP4 to Matroska, possibly others.
 2016-04-26 16:58:59 +02:00
Nicolas George
b8fa374fb6 lavf/concatdec: remove unrelated change during codecpar merge. 
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.

Fix trac ticket #5461.
 2016-04-26 16:58:59 +02:00
Michael Niedermayer
c84ba07db4 avformat/mux: Check that deinit is set before calling it 
Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-24 12:07:37 +02:00
Michael Niedermayer
dbe1dd59e0 avformat/mpegts: Skip over broken 0x80 headers 
This fixes demuxing of 01c56b0dc1.ts

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-24 02:51:50 +02:00
Michael Niedermayer
ea41ab0987 avformat/mpegts: factor duplicate seek back code into mpegts_resync 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-24 02:51:50 +02:00
Carl Eugen Hoyos
0499012a55 lavf/isom: Support Perian tag NELL for nellymoser. 
Reported by forum user turas35.
 2016-04-23 11:11:32 +02:00
Jan Sebechlebsky
2063f3ed9c avformat/tee: Handling slave failure in tee muxer 
Adds per slave option 'onfail' to the tee muxer allowing an output to
fail, so other slave outputs can continue.

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-22 20:04:27 +02:00
Jan Sebechlebsky
f9d7e9feec avformat/tee: Fix leaks in tee muxer when open_slave fails 
In open_slave failure can happen before bsfs array is initialized,
close_slave must check that bsfs is not NULL before accessing
tee_slave->bsfs[i] element.

Slave muxer expects write_trailer to be called if it's
write_header suceeded (so resources allocated in write_header
are freed). Therefore if failure happens after successfull
write_header call, we must ensure that write_trailer of
that particular slave is called.

Some cleanups are made by Marton Balint.

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-22 19:49:50 +02:00
Derek Buitenhuis
53a9b164c5 Merge commit '704a397697' 
* commit '704a397697':
  rtmpdh: add an stdio.h include

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-22 17:21:52 +01:00
Paul B Mahol
c85d04251d avcodec: add TrueMotion 2.0 Real Time decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-21 20:15:17 +02:00
Derek Buitenhuis
32c044cbc6 Merge commit '439929859a' 
* commit '439929859a':
  testprogs: Clean up #includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-21 16:04:17 +01:00
Derek Buitenhuis
7e3d3a6a89 Merge commit '3ee2ec5ec1' 
* commit '3ee2ec5ec1':
  unix: Use rw_timeout for setting the connect timeout

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-21 16:01:50 +01:00
Derek Buitenhuis
f8e89d8a29 Merge commit 'fab8156b2f' 
* commit 'fab8156b2f':
  avio: Copy URLContext generic options into child URLContexts

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-21 15:55:09 +01:00
Derek Buitenhuis
be5fde92ff libnut: Pass stream to ff_parse_specific_params 
This function bo longer takes an AVCodecContext.

Fixes ticket #5430.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-21 15:21:09 +01:00
wm4
656b07b5a9 lavf: use new decode API 
From Libav commit 8bc4accc37, with
additional code for decoding subtitles (not present in Libav).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-04-21 14:23:36 +02:00
wm4
7fc329e2dd lavc: introduce a new decoding/encoding API with decoupled input/output 
Until now, the decoding API was restricted to outputting 0 or 1 frames
per input packet. It also enforces a somewhat rigid dataflow in general.

This new API seeks to relax these restrictions by decoupling input and
output. Instead of doing a single call on each decode step, which may
consume the packet and may produce output, the new API requires the user
to send input first, and then ask for output.

For now, there are no codecs supporting this API. The API can work with
codecs using the old API, and most code added here is to make them
interoperate. The reverse is not possible, although for audio it might.

From Libav commit 05f66706d1.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-04-21 14:23:36 +02:00
Michael Niedermayer
a0b92788a8 avformat/utils: Remove use of caps_internal as it is not public API 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-21 13:49:32 +02:00
Derek Buitenhuis
90eb249969 Merge commit '933dec0e29' 
* commit '933dec0e29':
  file: Add an option for following a file that is being written

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-19 14:41:19 +01:00
Derek Buitenhuis
299d4f9428 Merge commit 'ccea588f83' 
* commit 'ccea588f83':
  avio: Add an option 'rw_timeout'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-18 15:47:54 +01:00
Derek Buitenhuis
4eef36a4f6 Merge commit 'd44f3e4059' 
* commit 'd44f3e4059':
  avio: Apply avoptions on the URLContext itself as well

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-18 15:35:12 +01:00
Derek Buitenhuis
8f540b8612 Merge commit '65a802401c' 
* commit '65a802401c':
  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 '709c0f79d8' 
* commit '709c0f79d8':
  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 '33d18982fa' 
* commit '33d18982fa':
  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 '9765549f55' 
* commit '9765549f55':
  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 '7e01d48cfd' 
* commit '7e01d48cfd':
  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 '1ceb07eb31'" 
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 'd40cb726d2' 
* commit 'd40cb726d2':
  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 '1ceb07eb31' 
* commit '1ceb07eb31':
  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 '3e8fd93b6a' 
* commit '3e8fd93b6a':
  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 'fa55addd23' 
* commit 'fa55addd23':
  img2: Drop av_ prefix for a static function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:59:58 +01:00