summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* avformat/avidec: Fix infinite loop in avi_read_nikon()Michael Niedermayer2016-09-02
| | | | | | | Fixes: 360/test.poc Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: added ability to use original stream ids as track ids ↵Erkki Seppälä2016-09-01
| | | | | | | | | | | | | | instead of regenerating them Sometimes it's useful to be able to define the exact track numbers in the generated track, instead of always beginning at track id 1. Using the option use_stream_ids_as_track_ids now copies the use stream ids to track ids. Dynamically generated tracks (ie. tmcd) have their track numbers defined as continuing from the highest numbered stream id. Signed-off-by: Erkki Seppälä <erkki.seppala.ext@nokia.com> Signed-off-by: OZOPlayer <OZOPL@nokia.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: add warning for append_list and hls_init_time optionSteven Liu2016-08-31
| | | | | | | | | When use append_list mode, the hls_init_time set nouse, Because the append_list only support append at the old m3u8 end cannot set init segments durations at the middle of the list. That's invalid. and show a warning message for user. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/crypto: add seeking support on readSimon Hailes2016-08-30
| | | | | | | | | | | | | | | | | | | | | cyrpto allows reading of data which has been aes-128-cbc encrypted given a key and an iv. But it did not handle filetypes which require seeking... e.g. it failed on an encrypted .mp4 file. example: take 25.mp4 created with: ffmpeg -f lavfi -i sine=frequency=1000:beep_factor=2:r=48000:duration=720.0 -f lavfi -i testsrc=duration=720.0:rate=25 -vcodec libx264 -cmp 22 -timecode 10:00:00:00 -r 25 -y out\25.mp4 encrypt with: openssl enc -aes-128-cbc -K 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -in 25.mp4 -out 25.enc then to transcode in ffmpeg: ffmpeg -key 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -i crypto:25.enc -vcodec mpeg4 -r 25 -y 25dec.mp4 prior to this modification, the transcode would fail. Note also: crypto previously maked both reads and writes as streamed, which caused the whole file to be read before the transcode started. Now, for read only, if the underlying layer is not marked as streamed, then crypto is not. This should enable efficient reading of encrypted containers which require seeking. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/crypto - encourage reads of 4096 bytesSimon Hailes2016-08-30
| | | | | | | the current implementation reads in chunks of 149x16=2384 bytes. Seems more logical for it to read in chunks of 4096 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avisynth: support pix_fmts added to AviSynth+Stephen Hutchinson2016-08-30
| | | | | | | | | | | | | | | A number of new pix_fmts have been added to AviSynth+: 16-bit packed RGB and RGBA 10-, 12-, 14, and 16-bit YUV 4:2:0, 4:2:2, and 4:4:4 8-, 10-, 12-, 14-, and 16-bit Planar RGB 8-, 10-, 12-, 14-, and 16-bit Planar YUVA and Planar RGBA* 10-, 12-, 14-, and 16-bit GRAY variants* 32-bit floating point Planar YUV(A), Planar RGB(A), and GRAY* *some of which are not currently available pix_fmts here and were not added to the demuxer due to this Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: add option hls_init_time to set init hls window segment ↵Steven Liu2016-08-29
| | | | | | | | | | duration recover segments duration time by hls_time after init hls window. This is reuqested by Ibrahim Tachijian Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: aax: pass proper AVClass to av_log()Thomas Hebb2016-08-28
| | | | | | | | | | | | | | | av_log() expects its first parameter to be a pointer to a struct whose first element is a pointer to an AVClass. In what I can only imagine is a typo, one call to av_log() in the AAX decryption code instead passes a pointer to an AVSHA struct, which doesn't even contain a pointer as its first element, much less a pointer to an AVClass. Change the call to pass the current MOVContext, as surrounding calls do. The incorrect AVClass was causing mpv to emit the warning "av_log callback called with bad parameters" when playing an .aax file. Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: fix decoded creation_time timestampsMarton Balint2016-08-28
| | | | | | | | | | | Use proper ISO 8601 timestamps which also signal that they are in UTC. This changes the format of creation_time and modification_date metadata values from 2016-06-01 22:30:00 to 2016-01-01T22:30:00.000000Z Fixes ticket #5673. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/utils: fix a codecpar non useJames Almer2016-08-27
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/utils: End probing if the expected codec surpasses ↵Michael Niedermayer2016-08-27
| | | | | | | | AVPROBE_SCORE_STREAM_RETRY Fixes Ticket5800 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* webm_chunk: Set pts precision to millisecondsVignesh Venkatasubramanian2016-08-25
| | | | | | | | Milliseconds is the de-factor precision for timestamps in Matroska/WebM media. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* mov: Remove old b-frame/video delay heuristicDerek Buitenhuis2016-08-25
| | | | | | | This was added before edts support existed, and is no longer valid. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* mov: Remove ancient heuristic hackDerek Buitenhuis2016-08-25
| | | | | | | | This breaks files with legitimate single-entry edit lists, and the hack, introduced in f03a081df09f9c4798a17d7e24446ed47924b11b, has no link to any known sample in its commit message. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* lavf/movenc: Add a missing assignment if memory allocation fails.Carl Eugen Hoyos2016-08-24
| | | | | Fixes a warning: libavformat/movenc.c:5947:17: warning: statement with no effect [-Wunused-value]
* avformat/avcodec: support rawvideo with planar rgb and alpha in nutPaul B Mahol2016-08-23
|
* libavformat/utils: added ability to probe AVMEDIA_TYPE_DATA formatErkki Seppälä2016-08-23
| | | | | | | | | | Now force_codec_ids supports AVMEDIA_TYPE_DATA and avformat_query_codec accepts data codecs as well in addition to video, audio and subtitle tracks. Signed-off-by: Erkki Seppälä <erkki.seppala.ext@nokia.com> Signed-off-by: OZOPlayer <OZOPL@nokia.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/fifo: Add fate testJan Sebechlebsky2016-08-22
| | | | | | Tested-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat: Add fifo pseudo-muxerJan Sebechlebsky2016-08-22
| | | | | Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mux: Restore original ts in write_packet on errorJan Sebechlebsky2016-08-22
| | | | | | | | | | Restore original timestamps in write_packet() if the actual write operation was not successfull. This allows to pass the same packet to nonblocking muxer repeatedly without corrupting the timestamps. Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/swfdec: Fix memleak on errorMichael Niedermayer2016-08-22
| | | | | | | Fixes: 9eb9cf5b8c26dd0fa7107ed0348dcc1f/signal_sigabrt_7ffff6ae7c37_8925_1f676b5229d009f2b56dfd9e149fa6ba.swf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/wtvdec: Check pointer before useMichael Niedermayer2016-08-21
| | | | | | | | Fixes out of array read Fixes: 049fdf78565f1ce5665df236d90f8657/asan_heap-oob_10a5a97_1026_42f9d4855547329560f385768de2f3fb.wtv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/hlsenc: add append_list flag into hlsencSteven Liu2016-08-21
| | | | | | | | | When ffmpeg exit by exception, start a new ffmpeg will cover the old segment list, add this flag can continue append the new segments into old hls segment list Signed-off-by: LiuQi <liuqi@gosun.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/mov: Accept known codepoints in 'colr'Steven Robertson2016-08-21
| | | | | | | | | | | | | | | | | | | | | | | | This change relaxes the whitelist on reading color metadata in MOV/BMFF containers. The whitelist on writing values is still in place. As a consequence it also fixes an apparent bug in reading 'nclc' values. The 'nclc' spec [1] is in harmony with ISO 23001-8 for the values it lists, but the code getting removed was remapping 5->6 and 6->7 for primaries, which is incorrect, and was remapping 6->5 for color matrix ("colorspace" in the code), which is equivalent but an unnecessary inconsistency. This logic error doesn't appear in movenc. Removing the whitelist allows proper conversion when the source codec relies on the container for proper signaling of newer codepoints, such as DNxHR and VP9. If converting to a codec or container that has updated its spec to include the new codepoints, the metadata will be preserved. If going back to MOV/BMFF, the output whitelist will still kick in, so this won't result in out-of-spec files being created. [1] https://developer.apple.com/library/mac/technotes/tn2162/_index.html Signed-off-by: Steven Robertson <steven@strobe.cc> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Check STSD atom more completelyMichael Niedermayer2016-08-20
| | | | | | | | Fixes out of array read Fixes: 13262c363a28da8d6bdcc472aed6e9dc/asan_heap-oob_cfb5e2_3733_31cf3fcc783295c34222eb070a784f84.3gp Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: Free extradata after successfull allocation of new instead ↵Michael Niedermayer2016-08-19
| | | | | | | | of before This avoids erroring out with extradata lost and extradata size mismatching Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/movenc: allow rewriting extradataUmair Khan2016-08-19
| | | | | Signed-off-by: Umair Khan <omerjerk@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/swfdec: Fix inflate() error code checkMichael Niedermayer2016-08-19
| | | | | | | | Fixes infinite loop Fixes endless.poc Found-by: 连一汉 <lianyihan@360.cn> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/swfdec: Move packet size check before side data allocationMichael Niedermayer2016-08-19
| | | | | | | | Fixes memleak Fixes: 9eb9cf5b8c26dd0fa7107ed0348dcc1f/signal_sigabrt_7ffff6ae7c37_8927_f14c2a6ae1ad0bbde2c94f1da50e7074.swf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec: add 64-bit signed pcm codecPaul B Mahol2016-08-18
|
* lavf/pcmdec: Try to fix msvc compilation after 4c42d306.Carl Eugen Hoyos2016-08-18
|
* avformat: factorize iso 8601 timestamp writer to a dictionary avutil functionMarton Balint2016-08-17
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* lavf/pcmdec: Map mime_type audio/L16 to the s16le demuxer.Carl Eugen Hoyos2016-08-17
| | | | Implements RFC 2586.
* lavf/version: fix belive/believe typoClément Bœsch2016-08-17
|
* lavf: mark stream as const pointer in av_stream_get_side_data() for next bumpClément Bœsch2016-08-17
|
* lavf/utils: add some const to pointers parameters in a few functionsClément Bœsch2016-08-17
|
* avformat/mov: Check extradata before accessMichael Niedermayer2016-08-16
| | | | | | | Fixes NULL ptr dereference Fixes Ticket5778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/http: add support for content_type option in listen modeMoritz Barsnick2016-08-14
| | | | | | | | | Instead of silently ignoring the content_type option in listen mode, apply its value to the provided "Content-Type:" header. Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/raw: Support QT b64a ARGB64 rawvideo.Carl Eugen Hoyos2016-08-13
| | | | | Decoder based on a patch by v0lt, v0lt rambler ru Fixes ticket #5657.
* libavformat/http: add support for headers option in listen modeMoritz Barsnick2016-08-12
| | | | | | | | Instead of silently ignoring the headers option in listen mode, use the provided headers. Signed-off-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avisynth: simplify the pix_fmt check for the newer AviSynth APIStephen Hutchinson2016-08-11
| | | | | | | The values don't need to be hardcoded since the correct values are returned by avs_bits_per_pixel. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/id3v2: fix memleak with empty stringsMichael Niedermayer2016-08-11
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat/mxfenc: add UID for unconstrained H.264 coded video in baseline ↵Matthias Hunstock2016-08-11
| | | | | | | | | profile Enable the MXF muxer to mux baseline H.264 video streams. Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/id3v2: Mark variable as unused to avoid "set but not used" warningMichael Niedermayer2016-08-08
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: read id3v2 comment tagsChris Moeller2016-08-07
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/mov: Enable mp3 parsing if a packet needs itMichael Niedermayer2016-08-06
| | | | | | Fixes Ticket5689 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/teeproto: set forgotten url_close()Michael Niedermayer2016-08-05
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf: forward protocol_whitelist for the remaining casesAndreas Cadhalpun2016-08-05
| | | | | | | Also set a default_whitelist for mmsh and ffrtmphttp. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/img2enc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:Michael Niedermayer2016-08-04
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/hlsenc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:Michael Niedermayer2016-08-04
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>