summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | avformat/ffmdec: Check pix_fmtMichael Niedermayer2016-04-281-0/+11
| | | | | | | | | | | | | | Fixes crash Fixes Ticket5412 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/riff: support for matrox m703 mpeg-2Александр Слободенюк2016-04-281-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/riff: assign g721 and g723 codec tags to g726 decoderPiotr Bandurski2016-04-281-0/+2
| |
* | lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.Nicolas George2016-04-261-0/+6
| | | | | | | | Fix remuxing H.264-in-MP4 to Matroska, possibly others.
* | lavf/concatdec: remove unrelated change during codecpar merge.Nicolas George2016-04-261-5/+0
| | | | | | | | | | | | | | Clearing the extradata is not related to the codecpar change, and it breaks if auto_convert is disabled. Fix trac ticket #5461.
* | avformat/mux: Check that deinit is set before calling itMichael Niedermayer2016-04-241-1/+2
| | | | | | | | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegts: Skip over broken 0x80 headersMichael Niedermayer2016-04-241-3/+9
| | | | | | | | | | | | This fixes demuxing of 01c56b0dc1.ts Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegts: factor duplicate seek back code into mpegts_resyncMichael Niedermayer2016-04-241-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/isom: Support Perian tag NELL for nellymoser.Carl Eugen Hoyos2016-04-231-0/+1
| | | | | | | | Reported by forum user turas35.
* | avformat/tee: Handling slave failure in tee muxerJan Sebechlebsky2016-04-221-11/+80
| | | | | | | | | | | | | | | | | | 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>
* | avformat/tee: Fix leaks in tee muxer when open_slave failsJan Sebechlebsky2016-04-221-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'Derek Buitenhuis2016-04-221-0/+3
|\ \ | |/ | | | | | | | | | | * commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7': rtmpdh: add an stdio.h include Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * rtmpdh: add an stdio.h includeAnton Khirnov2016-03-251-0/+3
| | | | | | | | The test uses printf.
* | avcodec: add TrueMotion 2.0 Real Time decoderPaul B Mahol2016-04-211-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'Derek Buitenhuis2016-04-212-2/+11
|\ \ | |/ | | | | | | | | | | * commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48': testprogs: Clean up #includes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * testprogs: Clean up #includesDiego Biurrun2016-03-242-2/+11
| |
* | Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'Derek Buitenhuis2016-04-211-0/+3
|\ \ | |/ | | | | | | | | | | * commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2': unix: Use rw_timeout for setting the connect timeout Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * unix: Use rw_timeout for setting the connect timeoutMartin Storsjö2016-03-241-0/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * tcp: Use rw_timeout for setting the connect/listen timeoutsMartin Storsjö2016-03-241-1/+5
| | | | | | | | | | | | | | | | Apply the default value for timeout in code instead of via the avoption, to allow distinguishing the default value from the user not setting anything at all. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'Derek Buitenhuis2016-04-2125-40/+46
|\ \ | |/ | | | | | | | | | | * commit 'fab8156b2f30666adabe227b3d7712fd193873b1': avio: Copy URLContext generic options into child URLContexts Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avio: Copy URLContext generic options into child URLContextsMartin Storsjö2016-03-2421-32/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since all URLContexts have the same AVOptions, such AVOptions will be applied on the outermost context only and removed from the dict, while they probably make sense on all contexts. This makes sure that rw_timeout gets propagated to the innermost URLContext (to make sure it gets passed to the tcp protocol, when opening a http connection for instance). Alternatively, such matching options would be kept in the dict and only removed after the ffurl_connect call. Signed-off-by: Martin Storsjö <martin@martin.st>
* | libnut: Pass stream to ff_parse_specific_paramsDerek Buitenhuis2016-04-211-1/+1
| | | | | | | | | | | | | | | | This function bo longer takes an AVCodecContext. Fixes ticket #5430. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | lavf: use new decode APIwm42016-04-211-15/+15
| | | | | | | | | | | | | | From Libav commit 8bc4accc37ab047d2fd85d672c577b39dfc918e1, with additional code for decoding subtitles (not present in Libav). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavc: introduce a new decoding/encoding API with decoupled input/outputwm42016-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 05f66706d182eb0c36af54d72614bf4c33e957a9. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/utils: Remove use of caps_internal as it is not public APIMichael Niedermayer2016-04-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'Derek Buitenhuis2016-04-192-1/+5
|\ \ | |/ | | | | | | | | | | * commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310': file: Add an option for following a file that is being written Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * file: Add an option for following a file that is being writtenMartin Storsjö2016-03-242-1/+5
| | | | | | | | | | | | | | | | Using this requires setting the rw_timeout option to make it terminate, alternatively using the interrupt callback (if used via the API). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ccea588f831906084b8c8235222920e6984beb72'Derek Buitenhuis2016-04-182-2/+5
|\ \ | |/ | | | | | | | | | | * commit 'ccea588f831906084b8c8235222920e6984beb72': avio: Add an option 'rw_timeout' Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avio: Add an option 'rw_timeout'Andrey Utkin2016-03-243-5/+19
| | | | | | | | | | | | | | | | | | | | | | If set non-zero, this limits duration of the retry_transfer_wrapper() loop, thus affecting ffurl_read*(), ffurl_write(). As soon as one single byte is successfully received/transmitted, the timer restarts. This has further changes by Michael Niedermayer and Martin Storsjö. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'Derek Buitenhuis2016-04-181-0/+3
|\ \ | |/ | | | | | | | | | | * commit 'd44f3e4059506a182f59218b1e967d42b01e097c': avio: Apply avoptions on the URLContext itself as well Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avio: Apply avoptions on the URLContext itself as wellMartin Storsjö2016-03-241-0/+3
| | | | | | | | | | | | | | Currently the list of avoptions for URLContext is empty though, but such options will be added. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavf: use new decode APIwm42016-03-231-12/+12
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavc: introduce a new decoding/encoding API with decoupled input/outputwm42016-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'Derek Buitenhuis2016-04-171-3/+3
|\ \ | |/ | | | | | | | | | | * commit '65a802401c6cc136576bb2e613c0577cbf622aa8': build: Add component for the SRTP common code Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Add component for the SRTP common codeDiego Biurrun2016-03-231-3/+3
| | | | | | | | This allows expressing the SRTP test code dependencies more clearly.
* | Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'Derek Buitenhuis2016-04-171-1/+1
|\ \ | |/ | | | | | | | | | | * commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc': nuv: Use the correct context for av_image_check_size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * nuv: Use the correct context for av_image_check_sizeVittorio Giovara2016-03-221-1/+1
| |
* | Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'Derek Buitenhuis2016-04-171-0/+6
|\ \ | |/ | | | | | | | | | | | | | | * 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>
* | avformat/hashenc: add missing avio_flush to hash_write_trailerJames Almer2016-04-161-0/+1
| | | | | | | | | | | | It was accidentally deleted in the previous hashenc commit Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/matroskaenc: Undo bits_per_coded_sample change as ↵Michael Niedermayer2016-04-161-2/+2
| | | | | | | | | | | | | | bits_per_raw_sample is available again Reminded-by: James Almer Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/bink: Cosmetics: Reindent after last commit.Carl Eugen Hoyos2016-04-151-10/+10
| |
* | lavf/bink: Support Monkey Island 4 (SMUSH) files.Carl Eugen Hoyos2016-04-152-3/+20
| | | | | | | | Fixes ticket #5410.
* | avformat/hashenc: simplify hash_write_trailerJames Almer2016-04-141-23/+5
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/yop: alloc codecpar extradata only onceJames Almer2016-04-141-6/+0
| | | | | | | | | | | | Fixes memleak Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: add AVFormatContext to ff_get_extradata()Paul B Mahol2016-04-1424-31/+31
| | | | | | | | | | | | Needed for av_log() inside that function. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'Derek Buitenhuis2016-04-141-9/+16
|\ \ | |/ | | | | | | | | | | * commit '9765549f551ff40869aee1a6492b6a976c86cfe9': mpegts: Forward the errors on mpeg4 objects parsing Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * mpegts: Forward the errors on mpeg4 objects parsingLuca Barbato2016-03-201-9/+16
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * matroska: Support V_QUICKTIME as written in the specificationLuca Barbato2016-03-151-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | Check if the size is written the first 4 bytes and read the next 4 as fourcc candidate, fallback checking the initial for 4 bytes. "The CodecPrivate contains all additional data that is stored in the 'stsd' (sample description) atom in the QuickTime file after the mandatory video descriptor structure (starting with the size and FourCC fields)" CC: libav-stable@libav.org
* | avformat/framehash: enable new outputJames Almer2016-04-135-22/+19
| | | | | | | | | | | | | | Also, make every addition except for sidedata part of version 1 instead of the new version 2. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/framehash: add sidedata checksumJames Almer2016-04-131-3/+29
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
OpenPOWER on IntegriCloud