summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '537b5b773b317af79d3a5b576ee9683e15ed84f6'James Almer2017-04-041-0/+2
|\ | | | | | | | | | | | | * commit '537b5b773b317af79d3a5b576ee9683e15ed84f6': rtmpdh: Do global initialization before running the test Merged-by: James Almer <jamrial@gmail.com>
| * rtmpdh: Do global initialization before running the testMartin Storsjö2016-11-241-0/+2
| | | | | | | | | | | | | | | | | | The rtmpdh code can use crypto libraries which may require a process global init. (gcrypt is one of the libraries where the rtmpdh test code can fail if global init hasn't been done, depending on gcrypt version.) Signed-off-by: Martin Storsjö <martin@martin.st>
| * rdt: Convert to the new bitstream readerAlexandra Hájková2016-11-241-17/+18
| |
| * ogg: Convert to the new bitstream readerAlexandra Hájková2016-11-242-28/+33
| |
| * mpegts: Convert to the new bitstream readerAlexandra Hájková2016-11-241-23/+25
| |
| * matroska: use av_stream_add_side_data() for stereo3d side dataJames Almer2016-11-231-14/+8
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * mov: Use av_stream_add_side_data() for displaymatrix side dataJames Almer2016-11-231-13/+5
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * utils: Add av_stream_add_side_data()James Almer2016-11-233-11/+43
| | | | | | | | | | | | | | | | Functionally similar to av_packet_add_side_data(). Allows the use of an already allocated buffer as stream side data. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * ape: Restructure DEBUG ifdefs to avoid unused function parameter warningsDiego Biurrun2016-11-221-2/+4
| |
| * rtpdec_mpeg4: const correctness for parse_fmtp_config()Diego Biurrun2016-11-211-1/+1
| | | | | | | | libavformat/rtpdec_mpeg4.c:282:38: warning: passing argument 2 of ‘parse_fmtp_config’ discards ‘const’ qualifier from pointer target type
| * hlsenc: Fix the openssl supportLuca Barbato2016-11-181-0/+1
| |
| * hlsenc: Add encryption supportLuca Barbato2016-11-171-18/+198
| | | | | | | | Partially based on Christian Suloway <csuloway@globaleagleent.com> work.
* | avformat/mov: Check creation_time for overflowMichael Niedermayer2017-04-041-0/+6
| | | | | | | | | | | | | | | | Fixes integer overflow Fixes: 701640 Found-by: Found-by: Thomas Guilbert <tguilbert@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Bump versions for master after 3.3Michael Niedermayer2017-04-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Bump minor for 3.3Michael Niedermayer2017-04-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/oggparsedaala: Do not leave an invalid value in gpshiftMichael Niedermayer2017-04-011-0/+1
| | | | | | | | | | | | | | | | | | Fixes: undefined behavior Fixes: 702974 Found-by: Thomas Guilbert <tguilbert@google.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/oggparsedaala: Check duration for AV_NOPTS_VALUEMichael Niedermayer2017-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | This avoids an integer overflow the solution matches oggparsevorbis.c and 45581ed15d2ad5955e24d809820c1675da68f500 Fixes: 700242 Found-by: Thomas Guilbert <tguilbert@google.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88'Clément Bœsch2017-04-011-31/+28
|\ \ | |/ | | | | | | | | | | | | | | * commit 'd860a3cc0a12360a92b9ffd179a0c34413beaf88': crypto: Add encryption support See 00d4013d9f841c189a2f10dd05526ca40129b880 Merged-by: Clément Bœsch <u@pkh.me>
| * crypto: Add encryption supportChristian Suloway2016-11-171-21/+146
| | | | | | | | | | | | Signed-off-by: Christian Suloway <csuloway@globaleagleent.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'Clément Bœsch2017-04-011-12/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '3cc3463f306f425f76bd962755df1132eeac6dfa': avisynth: Support pix_fmts added to AviSynth+ This commit is mostly a noop, see 92916e8542e425ca20daddb490261a5818643206. Cosmetics and a small fix are merged. Merged-by: Clément Bœsch <u@pkh.me>
| * avisynth: Support pix_fmts added to AviSynth+Stephen Hutchinson2016-11-171-1/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Diego Biurrun <diego@biurrun.de>
| * avisynth: Simplify the pix_fmt check for the newer AviSynth APIStephen Hutchinson2016-11-171-22/+5
| | | | | | | | | | | | | | The values don't need to be hardcoded since the correct values are returned by avs_bits_per_pixel. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * avisynth: Fix setting stream timebaseMarton Balint2016-11-171-5/+3
| | | | | | | | | | | | | | | | | | Stream timebase should be set using avpriv_set_pts_info, otherwise avctx->pkt_timebase is not correct, leading to A/V desync. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mov: Fix identity matrix boolean logicVittorio Giovara2016-11-161-2/+2
| | | | | | | | | | | | | | | | This prevented the code from correctly exporting the rotation matrix which caused a few samples to be displayed wrong. Introduced in ecd2ec69ce10e13f6ede353d2def7c. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'James Almer2017-03-311-2/+1
|\ \ | |/ | | | | | | | | | | * commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6': Drop pointless void* casts Merged-by: James Almer <jamrial@gmail.com>
| * Drop pointless void* castsDiego Biurrun2016-11-131-2/+1
| |
| * nut: Use correct function pointer casts instead of void*Diego Biurrun2016-11-123-5/+10
| | | | | | | | | | Fixes several warnings of the type libavformat/nut.c:207:42: warning: ISO C forbids conversion of function pointer to object pointer type [-Wpedantic]
| * matroskaenc: write updated STREAMINFO metadata for FLAC streams if availableJames Almer2016-11-101-0/+27
| | | | | | | | | | | | | | | | | | | | FLAC streams originating from the FLAC encoder send updated and more complete STREAMINFO metadata as part of the last packet, so write that to CodecPrivate instead of the incomplete one available in extradata during init. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * matroskaenc: fix muxing AAC streams when using aac_adtstoasc bsfJames Almer2016-11-101-6/+74
| | | | | | | | | | | | | | | | | | | | | | | | aac_adtstoasc makes the aac extradata available only after the first packet is filtered, and as packet side data. Assume extradata will be available as part of the first packet if avpriv_mpeg4audio_get_config() fails the first time due to missing extradata and reserve space for the OutputSampleRate element in the Tracks master. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/dump: use av_spherical_projection_name() to print spherical ↵James Almer2017-03-311-10/+1
| | | | | | | | | | | | | | projection names Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/amr: Return AVERROR_EOF on EOF.Carl Eugen Hoyos2017-03-311-1/+3
| | | | | | | | Fixes ticket #6280.
* | lavf/mov.c: Add -advanced_editlist option for mov format.Sasi Inguva2017-03-312-4/+24
| | | | | | | | | | | | | | Adding an MOV format option to turn on/off the editlist supporting code, introduced in https://github.com/FFmpeg/FFmpeg/commit/ca6cae73db207f17a0d5507609de12842d8f0ca3 Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Bump minor versions for master after release/3.3 branchpointMichael Niedermayer2017-03-311-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Bump minor versions for staring release/3.3 branchMichael Niedermayer2017-03-311-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'Clément Bœsch2017-03-3111-27/+23
|\ \ | |/ | | | | | | | | | | * commit '67deba8a416d818f3d95aef0aa916589090396e2': Use avpriv_report_missing_feature() where appropriate Merged-by: Clément Bœsch <cboesch@gopro.com>
| * Use avpriv_report_missing_feature() where appropriateDiego Biurrun2016-11-0813-32/+28
| |
| * mov: Read multiple stsd from DVVittorio Giovara2016-11-081-0/+2
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * hevc: Support extradata changes from multiple stsdVittorio Giovara2016-11-081-7/+5
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/mov: Init ref_sc / ref_st to NULLMichael Niedermayer2017-03-301-2/+2
| | | | | | | | | | | | | | | | | | This is more robust in case some change or corner case causes them to be dereferenced before being set Fixes CID1396274, CID1396275 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/libopenmpt: Check for avio_size() failureMichael Niedermayer2017-03-301-1/+1
| | | | | | | | | | | | Fixes CID1396850 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mux: Check return code of av_packet_split_side_data()Michael Niedermayer2017-03-301-2/+5
| | | | | | | | | | | | Fixes CID1403225 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/nut: Add HEVC and Opus supportLeo Izen2017-03-301-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '67351924fa91dea4339109100a4c0689f006581f'Clément Bœsch2017-03-303-3/+0
|\ \ | |/ | | | | | | | | | | * commit '67351924fa91dea4339109100a4c0689f006581f': Drop unreachable break and return statements Merged-by: Clément Bœsch <cboesch@gopro.com>
| * Drop unreachable break and return statementsDiego Biurrun2016-11-033-3/+0
| |
* | Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'Clément Bœsch2017-03-291-4/+5
|\ \ | |/ | | | | | | | | | | * commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6': rtmpproto: Restructure zlib code to avoid unreachable code warning Merged-by: Clément Bœsch <u@pkh.me>
| * rtmpproto: Restructure zlib code to avoid unreachable code warningDiego Biurrun2016-11-021-4/+5
| | | | | | | | libavformat\rtmpproto.c(1165) : warning C4702: unreachable code
| * mov: Evaluate the movie display matrixVittorio Giovara2016-11-012-14/+37
| | | | | | | | | | | | | | | | | | | | | | This matrix needs to be applied after all others have (currently only display matrix from trak), but cannot be handled in movie box, since streams are not allocated yet. So store it in main context, and apply it when appropriate, that is after parsing the tkhd one. Fate tests are updated accordingly. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * openssl: Allow newer TLS versions than TLSv1Mark Thompson2016-10-311-1/+6
| | | | | | | | | | | | The use of TLSv1_*_method() disallows newer protocol versions; instead use SSLv23_*_method() and then explicitly disable the deprecated protocol versions which should not be supported.
* | Fix all -Wformat warnings raised by DJGPPClément Bœsch2017-03-2924-51/+59
| |
* | lavf: use av_fourcc2str() where appropriateClément Bœsch2017-03-299-35/+23
| |
OpenPOWER on IntegriCloud