summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4'Clément Bœsch2016-06-29
|\ | | | | | | | | | | | | * commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4': indeo2: Drop disabled big-endian ir2_codes table Merged-by: Clément Bœsch <clement@stupeflix.com>
| * indeo2: Drop disabled big-endian ir2_codes tableDiego Biurrun2016-06-07
| | | | | | | | Only the little-endian variant of the table is ever used.
* | Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'Clément Bœsch2016-06-29
|\| | | | | | | | | | | | | * commit 'b7f98659f21dce438c33b512e25fd64b8d07c347': Remove unnecessary get_bits.h #includes Merged-by: Clément Bœsch <clement@stupeflix.com>
| * Remove unnecessary get_bits.h #includesDiego Biurrun2016-06-07
| |
* | Merge commit '2a48a75a6f508121b96b0732a9fe03a46303f579'Clément Bœsch2016-06-29
|\| | | | | | | | | | | | | | | | | * commit '2a48a75a6f508121b96b0732a9fe03a46303f579': sgirledec: simplify, no need to use reget buffer This commit is a noop, see ccc3f4e7104eda0f72436720ebcdc2e916217c7a Merged-by: Clément Bœsch <clement@stupeflix.com>
| * sgirledec: simplify, no need to use reget bufferPaul B Mahol2016-06-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'Clément Bœsch2016-06-29
|\| | | | | | | | | | | | | | | | | * commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d': aic: add frame threading support This commit is a noop, see 8e069eb525d46b8f89089e37fc7ac81b2d9b1092 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * aic: add frame threading supportPaul B Mahol2016-06-06
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'Clément Bœsch2016-06-29
|\| | | | | | | | | | | | | * commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9': fate: Move Canopus decoder tests to a separate file Merged-by: Clément Bœsch <clement@stupeflix.com>
| * fate: Move Canopus decoder tests to a separate fileVittorio Giovara2016-06-06
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffersMatthieu Bouron2016-06-29
| | | | | | | | Fixes a regression introduced by 0cd5e281df3f69c1ed8f2a72a5bcbf9691e1b5d5.
* | avformat/mov: Check sample sizeMichael Niedermayer2016-06-29
| | | | | | | | | | | | | | | | Fixes integer overflow Fixes: poc.mp4 Found-by: ajax secure <ajax4sec@hotmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate/webp : add test for lossy compression.Martin Vignali2016-06-28
| | | | | | | | | | | | | | the result of ffmpeg decoding is binary exact with the yuv output of official decoder (dwebp) Signed-off-by: James Almer <jamrial@gmail.com>
* | avdevice/decklink_common: Replace rare spelling of Succesfully by 500 times ↵Michael Niedermayer2016-06-28
| | | | | | | | | | | | more common one Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/ccaption_dec: Fix mixed declaration and statement.Michael Niedermayer2016-06-28
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/ccaption_dec: implement tab offset commandsAman Gupta2016-06-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | MAINTAINERS: remove 2.4 as 3.1 was releasedMichael Niedermayer2016-06-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'Clément Bœsch2016-06-27
|\| | | | | | | | | | | | | | | | | * commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54': avconv: Do not copy extradata if source buffer is empty This commit is a noop, see 4d02dfbde475d249916eb19c360e890059aa6aa5 Merged-by: Clément Bœsch <u@pkh.me>
| * avconv: Do not copy extradata if source buffer is emptyVittorio Giovara2016-06-06
| | | | | | | | | | | | | | Fixes clang-usan runtime error "null pointer passed as argument 2, which is declared to never be null" while streamcopying. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '38f99017e69bd25e88be87117237c29727c25635'Clément Bœsch2016-06-27
|\| | | | | | | | | | | | | | | | | * commit '38f99017e69bd25e88be87117237c29727c25635': vp9: Return the correct size when decoding a superframe This commit is a noop, see c2f3715cb3fce093137591e3005de3e831b1f9fd Merged-by: Clément Bœsch <u@pkh.me>
| * vp9: Return the correct size when decoding a superframeDenis Charmet2016-06-05
| | | | | | | | | | | | | | | | | | | | | | | | According to avcodec.h, avcodec_decode_video2 should return the number of bytes used if a frame was decoded. The current implementation returns size - used size of all the subframes. This fixes the VLC's bug https://trac.videolan.org/vlc/ticket/16836. The superframe is always fully consumed. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5'Clément Bœsch2016-06-27
|\| | | | | | | | | | | | | * commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5': build: Only enable symbol reduction if the compiler does proper DCE Merged-by: Clément Bœsch <u@pkh.me>
| * build: Only enable symbol reduction if the compiler does proper DCEDiego Biurrun2016-05-30
| | | | | | | | | | | | | | | | With compilers that do not support proper dead code elimination, like Sun C 5.12, linking fails due to missing references to unavailable, but also unused, symbols. Bug-Id: 895
* | Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'Clément Bœsch2016-06-27
|\| | | | | | | | | | | | | * commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1': build: Simplify postprocessing of linker version script files Merged-by: Clément Bœsch <u@pkh.me>
| * build: Simplify postprocessing of linker version script filesDiego Biurrun2016-05-29
| | | | | | | | Generate the files in a single postprocessing step w/o intermediate files.
* | lavc/pnm_parser: disable parsing for text based PNMsClément Bœsch2016-06-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM files. We can not obtain the buffer size using av_imgage_get_buffer_size() as every pixel in the picture will occupy a random size between 16 and 32 bits ("4 " and "231 " are such example). Ideally, we could look for the next header (or EOF) in the bytestream, but this commit is meant to fix a decoding regression introduced by 48ac4532d437790e56b8ed5d0d467dc88685f035. Fix Ticket #5670
* | Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'Matthieu Bouron2016-06-27
|\| | | | | | | | | | | | | * commit '535a742c2695a9e0c586b50d7fa76e318232ff24': build: Change structure of the linker version script templates Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| * build: Change structure of the linker version script templatesDiego Biurrun2016-05-29
| | | | | | | | | | | | Split version files into one line per symbol/directive to allow compatibility with the Solaris linker without preprocessing and eliminate $ from version file templates to simplify the postprocessing shell command.
* | Changelog: Add VideoToolbox encoder entry for 3.1Rick Kern2016-06-27
| | | | | | | | Signed-off-by: Rick Kern <kernrj@gmail.com>
* | Merge commit '5b1b495c8d21600eac694d50f428654a3125e217'Matthieu Bouron2016-06-27
|\| | | | | | | | | | | | | * commit '5b1b495c8d21600eac694d50f428654a3125e217': build: Print a message when generating version scripts Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| * build: Print a message when generating version scriptsDiego Biurrun2016-05-29
| |
* | asm: FF_-prefix internal macros used in inline assemblyMatthieu Bouron2016-06-27
| | | | | | | | See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
* | Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'Matthieu Bouron2016-06-27
|\| | | | | | | | | | | | | | | | | | | * commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e': asm: FF_-prefix internal macros used in inline assembly This commit is a noop as the ASM codebase differs too much between libav and ffmpeg. The corresponding chunks will be found in the next commit. Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| * asm: FF_-prefix internal macros used in inline assemblyDiego Biurrun2016-05-28
| | | | | | | | | | These warnings conflict with system macros on Solaris, producing truckloads of warnings about macro redefinition.
* | avformat/mov: parse rtmd track timecodePaul B Mahol2016-06-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avdevice/decklink: fix mingw portabilityMarton Balint2016-06-27
| | | | | | | | | | | | Fixes ticket #5669. Signed-off-by: Marton Balint <cus@passwd.hu>
* | configure: use c++98 for c++ filesRick Kern2016-06-26
| | | | | | | | | | | | | | Use c++98 standard instead of c++11. Signed-off-by: Rick Kern <kernrj@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate/webp : add test for webp lossless decoding (rgb and rgba)Martin Vignali2016-06-26
| | | | | | | | | | | | output have been compared with official decoding tool output (dwebp) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate/exr : add tests for file with half and float channelsMartin Vignali2016-06-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | changelog: fix entry orderJames Almer2016-06-26
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Update FFmpeg 3.1 cut markerJames Almer2016-06-26
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avdevice/decklink: add support for setting input packet timestamp sourceMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: add support for audio and video input selectionMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: add support for setting duplex modeMarton Balint2016-06-26
| | | | | | | | | | | | | | This patch also makes BlackMagic drivers v10.6.1 a hard requirement. Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: always free decklink resources on errorMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: factorize device finder functionMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: remove unused itermode iteratorsMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink: factorize cleanup function to common codeMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avdevice/decklink_dec: fix bitrate calculationsMarton Balint2016-06-26
| | | | | | | | | | Reviewed-by: Deti Fliegl <deti@fliegl.de> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avcodec/libopenjpegenc: Set numresolutions by default to a value that is not ↵Michael Niedermayer2016-06-26
| | | | | | | | | | | | | | | | too large Fixes issues with libopenjpeg 2.1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>