summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* librtmp: Avoid an infiniloop setting connection argumentsrelease/2.6Luca Barbato2016-07-261-0/+2
| | | | | | | | The exit condition was missing. Signed-off-by: Timothy Gu <timothygu99@gmail.com> (cherry picked from commit e85d38c20a8893cb59d7c86f74481f2497882196) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* avformat/oggparsevp8: fix pts calculation on pages ending with an invisible ↵James Almer2016-07-251-1/+5
| | | | | | | frame Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit 5adfbd391847fcdaea1e9b105fae2dd90af2a733)
* Changelog: update for the last 2 commitsn2.6.9Michael Niedermayer2016-05-031-0/+2
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mjpegdec: Do not try to detect last scan but apply idct after all ↵Michael Niedermayer2016-05-021-15/+37
| | | | | | | | | | | scans for progressive jpeg Fixes: IMG-20160418-WA0002.jpg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit deaf58abf236e09fc9b97db29f1edd064e4b5ad4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/options_table: Add missing identifier for very strict complianceMichael Niedermayer2016-05-021-0/+1
| | | | | | | | | Fixes Ticket5443 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 11db7eee9b001d6992c34b65ee7b0d64f6f5c758) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Update for 2.6.9Michael Niedermayer2016-04-303-2/+39
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/ffmdec: Check pix_fmtMichael Niedermayer2016-04-291-0/+11
| | | | | | | | | | Fixes crash Fixes Ticket5412 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 78baa450d9939957f52d5187beb95d763d2f1f18) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ttaenc: Reallocate packet if its too smallMichael Niedermayer2016-04-291-2/+13
| | | | | | | | | | | | Fixes assertion failure Fixes Ticket5394 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 005c61c6b8982f977e415aa69d2d2b42e6b7f3f2) Conflicts: libavcodec/ttaenc.c
* pgssubdec: fix subpicture output colorspace and rangeJan Ekström2016-04-292-2/+18
| | | | | | | | | | | | | | | | | | Functionality used before didn't widen the values from limited to full range. Additionally, now the decoder uses BT.709 where it should be used according to the video resolution. Default for not yet set colorimetry is BT.709 due to most observed HDMV content being HD. BT.709 coefficients were gathered from the first two parts of BT.709 to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2). They were additionally confirmed by manually calculating values. Fixes #4637 (cherry picked from commit 9779b6262471d553c1ed811ff7312564e39d8adf) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3Michael Niedermayer2016-04-291-5/+7
| | | | | | | | | Fixes Ticket5319 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9ac154d1facd4756db6918f866dccf3e3ffb698c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_drawtext: Check return code of load_glyph()Michael Niedermayer2016-04-291-1/+3
| | | | | | | | | | Fixes segfault Fixes Ticket5347 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2e67a99fbc6b99315925de40fc6fa7161576be10) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/takdec: add code that got somehow lost in process of REingPaul B Mahol2016-04-291-0/+1
| | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 38797a8033d061ade58b30b8ac86da222fe42a84) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/apedec: fix decoding of stereo files with one channel full of silencePaul B Mahol2016-04-291-1/+1
| | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 9149e9c0baaec122bc3da925d6068dffa60b5427) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/avpacket: Fix off by 5 errorMichael Niedermayer2016-04-291-2/+4
| | | | | | | | | | | | | Fixes out of array read Fixes: mozilla bug 1266129 Found-by: Tyson Smith Tested-by: Tyson Smith Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9f36ea57ae6eefb42432220feab0350494f4144c) Conflicts: libavcodec/avpacket.c
* avcodec/h264: Fix for H.264 configuration parsingIvan2016-04-291-2/+2
| | | | | | | | | | | | Sometimes video fails to decode if H.264 configuration changes mid stream. The reason is that configuration parser assumes that nal_ref_idc is equal to 11b while actually some codecs but 01b there. The H.264 spec is somewhat vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3a727606c474d3d0b9efa3c900294a84bdb5e331) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/bmp_parser: Ensure remaining_size is not too small in startcode ↵Michael Niedermayer2016-04-291-1/+1
| | | | | | | | | | | packet crossing corner case Fixes Ticket 5438 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 8e26bdd59bf559d00c7e60c53fff292de10139ff) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/src_movie: fix how we check for overflows with seek_pointMarios Titas2016-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | Currently, if the movie source filter is used and a seek_point is specified on a file that has a negative start time, ffmpeg will fail. An easy way to reproduce this is as follows: $ ffmpeg -vsync passthrough -filter_complex 'color=d=10,setpts=PTS-1/TB' test.mp4 $ ffmpeg -filter_complex 'movie=filename=test.mp4:seek_point=2' -f null - The problem is caused by checking for int64_t overflow the wrong way. In general, to check whether a + b overflows, it is not enough to do: a > INT64_MAX - b because b might be negative; the correct way is: b > 0 && > a > INT64_MAX - b Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c1f9734f977f59bc0034096afbe8e43e40d93a5d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/j2kenc: Add attribution to OpenJPEG project:Aaron Boxer2016-04-291-0/+38
| | | | | | | | | http://ghostscript.com/~tor/gs-browse/gs/openjpeg/libopenjpeg/t1.c Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit b6b4b0a65e02495edf9d7e5b23bef99a92921147) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/libutvideodec: copy frame so it has reference counters when ↵Michael Niedermayer2016-04-291-1/+11
| | | | | | | | | | refcounted_frames is set Reviewed-by: maintainer Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0cd9ff4e3aa23318a855c21d60b1c9035b2b99d2) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/rtpdec_jpeg: fix low contrast image on low quality settingIco Doornekamp2016-04-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original mail and my own followup on ffmpeg-user earlier today: I have a device sending out a MJPEG/RTP stream on a low quality setting. Decoding and displaying the video with libavformat results in a washed out, low contrast, greyish image. Playing the same stream with VLC results in proper color representation. Screenshots for comparison: http://zevv.nl/div/libav/shot-ffplay.jpg http://zevv.nl/div/libav/shot-vlc.jpg A pcap capture of a few seconds of video and SDP file for playing the stream are available at http://zevv.nl/div/libav/mjpeg.pcap http://zevv.nl/div/libav/mjpeg.sdp I believe the problem might be in the calculation of the quantization tables in the function create_default_qtables(), the attached patch solves the issue for me. The problem is that the argument 'q' is of the type uint8_t. According to the JPEG standard, if 1 <= q <= 50, the scale factor 'S' should be 5000 / Q. Because the create_default_qtables() reuses the variable 'q' to store the result of this calculation, for small values of q < 19, q wil subsequently overflow and give wrong results in the calculated quantization tables. The patch below uses a new variable 'S' (same name as in RFC2435) with the proper range to store the result of the division. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e3e6a2cff4af9542455d416faec4584d5e823d5d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mjpegenc_common: Store approximate aspect if exact cannot be storedMichael Niedermayer2016-04-291-2/+12
| | | | | | | | | Fixes Ticket5244 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 068026b0f7845e0f1850094d974f60d181480d64) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/resample: Remove disabled and faulty codeMichael Niedermayer2016-04-291-6/+0
| | | | | | | | | Fixes Ticket5345 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 50ef7361cb5f78c94da2323f3bae86c6bbd618c8) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* indeo2: Fix banding artefactsLuca Barbato2016-04-292-39/+138
| | | | | | | | | | | | Rename luma table to delta table and change how it is used. CC: libav-stable@libav.org Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de> (cherry picked from commit f8c34f4b8d62afad3f63cf3d9617d73735bef8c1) (cherry picked from commit 73f3c8f73edf0a69502233b2c50fa9e7104f99ec) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* indeo2data: K&R formatting cosmeticsLuca Barbato2016-04-291-104/+104
| | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de> (cherry picked from commit d4066a702407352a0648af882c34ea81a404fa2b) (cherry picked from commit 522ab0b9a92962edda7156a91a494a1e2b8a7f64) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/imgconvert: Support non-planar colorspaces while paddingPrzemysław Sobala2016-04-291-2/+35
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0d097a869c38850c9ac09bccef60a229470f489b) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/random_seed: Add the runtime in cycles of the main loop to the ↵Michael Niedermayer2016-04-291-1/+6
| | | | | | | | | | | entropy pool This should theoretically improve the randomness slightly Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2540d884f3fd7cfac503e048112098967be2569a) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/channel_layout: AV_CH_LAYOUT_6POINT1_BACK not reachable in parsingMartin Cracauer2016-04-291-1/+1
| | | | | | | | | | | | | | Trying to make heads and tails out of DTS 6.1 I can across this typo. I also noticed that this wiki page is incorrect or misleading, the channel order for 6.1 given does not match the source code. At the least it should be clarified that the layout given does not apply to DTS. https://trac.ffmpeg.org/wiki/AudioChannelManipulation Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 73d1398f0c4ce2de16790f46e05a79242137d153) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/concatdec: set safe mode to enabled instead of autoMichael Niedermayer2016-04-292-3/+5
| | | | | | | | | | | | | | This is safer, as a selected demuxer could still mean that it was auto-detected by a user application Reviewed-previously-by: Nicolas George <george@nsup.org> Reviewed-previously-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 689211d5727231c3fe92762d224dbadebdbf4e30) Conflicts: libavformat/concatdec.c
* avformat/rtpenc: Fix integer overflow in NTP_TO_RTP_FORMATBoris Nagels2016-04-291-1/+2
| | | | | | | | | | | | | | | | | RTCP synchronization packet was broken since commit in ffmpeg version > 2.8.3 (commit: e04b039b1528f4c7df5c2b93865651bfea168a19) Since this commit (2e814d0329aded98c811d0502839618f08642685) "rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps", NTP_TO_RTP_FORMAT uses av_rescale_rnd() function to add the data to the packet. This causes an overflow in the av_rescale_rnd() function and it will return INT64_MIN. Causing the NTP stamp in the RTCP packet to have an invalid value. Github: Closes #182 Reverting commit '2e814d0329aded98c811d0502839618f08642685' solves the problem. (cherry picked from commit 1109ed7973c7fd1e7001898adc4976590d862122) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/cache: Fix memleak of tree entriesMichael Niedermayer2016-04-291-0/+7
| | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 554f6e930ce05a4c5449efcaae36bdafe2d9de74) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavf/mov: fix sidx with edit listsRodger Combs2016-04-291-1/+1
| | | | | | (cherry picked from commit 3617e69d50dd9dd07b5011dfb9477a9d1a630354) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mjpegdec: Fix decoding slightly odd progressive jpegMichael Niedermayer2016-04-291-6/+4
| | | | | | | | | Fixes: ebd58db6-dc86-11e5-91c2-59daeddf50c7.jpg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit c6f4720b8664e6e22eb5b3da6bb48ed5b113f746) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/avpacket: clear priv in av_init_packet()Michael Niedermayer2016-04-291-0/+1
| | | | | | | | | | | This should fix leaving uninitialized pointers in priv which can confuse user applications. See: https://github.com/golang/go/issues/14426 Only or release branches Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/utils: Fix chrSrcHSubSample for GBRAP16Michael Niedermayer2016-04-291-0/+1
| | | | | | | | | Fixes part of Ticket5264 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 67e5bd0c501f7568fc8d93284d0f7eb40663ab06) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/input: Fix GBRAP16 inputMichael Niedermayer2016-04-291-0/+20
| | | | | | | | | Fixes part of Ticket5264 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit df36257a53561a51af969a6ea6319dd2579509b9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* postproc: fix unaligned accessCarl Eugen Hoyos2016-04-291-1/+1
| | | | | | | | Based on 59074310 by Andreas Cadhalpun. Fixes ticket #5259. (cherry picked from commit 2aa21eec1adcb3737be59f0eab7081c5a790faa9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/pixdesc: Make get_color_type() aware of CIE XYZ formatsMichael Niedermayer2016-04-291-0/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1ec7a703806049265991723a8826bd61555edef4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/x86/output: Fix yuv2planeX_16* with unaligned destinationMichael Niedermayer2016-04-291-7/+16
| | | | | | | | Reviewed-by: BBB Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f6492a2ea8df80be0ed9591aee4019cef0e36e99) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swscale/x86/output: Move code into yuv2planeX_mainloopMichael Niedermayer2016-04-291-69/+72
| | | | | | | | Reviewed-by: BBB Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d07f6e5f1c36be675e0900edba3e40a32f05f0f4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* MAINTAINERS: add myself as an OS/2 maintainerKO Myung-Hun2016-04-291-0/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 346ec917646c18fc9e26bddf04bfa8f8f1e2e18f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/utils: fix typo for min() descriptionPaul B Mahol2016-03-021-1/+1
| | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit bdf474bcff29f5b40fe14f6fa1dbe10e69c73ab7) Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* Update for 2.6.8n2.6.8Michael Niedermayer2016-02-013-2/+37
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* MAINTAINERS: remove unmaintained releasesMichael Niedermayer2016-01-311-2/+0
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/jpeg2000dec: More completely check cdefMichael Niedermayer2016-01-311-5/+9
| | | | | | | | | | | Fixes out of array access Fixes: j2k-poc.bin Found-by: Lucas Leong <wmliang.tw@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 0aada30510d809bccfd539a90ea37b61188f2cb4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/opt: check for and handle errors in av_opt_set_dict2()Michael Niedermayer2016-01-311-3/+4
| | | | | | | | | Previously errors could result in random entries to be lost. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f3ace85d8869c3dddd2d28d064002d0d912e3624) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/flacenc: fix calculation of bits required in case of custom sample ratePaul B Mahol2016-01-311-1/+1
| | | | | | | | | | | Sample rate of 11025 takes 16 bits but previous code would pick only 8. Fixes assertion failure. Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit 3e7d6849120d61bb354376d52786c26f20e20835) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: Document urls a bitMichael Niedermayer2016-01-311-0/+12
| | | | | | | | Spell-checked-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3130556c0eb09f3da3c9de6473a97937a4648d62) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/libquvi: Set default demuxer and protocol limitationsMichael Niedermayer2016-01-311-0/+14
| | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 15cc98a0f38ac45444d177186cfbf28e14bd5f1f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/concat: Check protocol prefixMichael Niedermayer2016-01-311-1/+4
| | | | | | | | Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 8e32d014322eada1812af268d7ea9d53169d279c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* doc/demuxers: Document enable_drefs and use_absolute_pathMichael Niedermayer2016-01-311-0/+17
| | | | | | | | Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9a8034b8bc1d1cd7a8889dc385d41744be47b159) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
View Lorry Controller Status