summaryrefslogtreecommitdiffstats
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>
* | Merge commit '2f99117f6ff24ce5be2abb9e014cb8b86c2aa0e0'James Almer2017-04-040-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '2f99117f6ff24ce5be2abb9e014cb8b86c2aa0e0': aarch64: vp9itxfm: Don't repeatedly set x9 when nothing overwrites it This commit is a noop, see 37cb224e3e65b92eb6d77f1a788d882fbee972c3 Merged-by: James Almer <jamrial@gmail.com>
| * aarch64: vp9itxfm: Don't repeatedly set x9 when nothing overwrites itMartin Storsjö2016-11-241-11/+15
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2dbe2aa2c2d4f02d2669feae45dee4fc45414813'James Almer2017-04-040-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2dbe2aa2c2d4f02d2669feae45dee4fc45414813': rdt: Convert to the new bitstream reader ogg: Convert to the new bitstream reader mpegts: Convert to the new bitstream reader xsubdec: Convert to the new bitstream reader xan: Convert to the new bitstream reader wnv1: Convert to the new bitstream reader vima: Convert to the new bitstream reader vble: Convert to the new bitstream reader utvideodec: Convert to the new bitstream reader twinvq: Convert to the new bitstream reader tscc2: Convert to the new bitstream reader truespeech: Convert to the new bitstream reader tiertex: Convert to the new bitstream reader truemotion2: Convert to the new bitstream reader svq1dec: Convert to the new bitstream reader smacker: Convert to the new bitstream reader sipr: Convert to the new bitstream reader rtjpeg: Convert to the new bitstream reader ra288: Convert to the new bitstream reader ra144: Convert to the new bitstream reader This merge is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: James Almer <jamrial@gmail.com>
| * 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
| |
| * xsubdec: Convert to the new bitstream readerAlexandra Hájková2016-11-241-7/+8
| |
| * xan: Convert to the new bitstream readerAlexandra Hájková2016-11-241-4/+4
| |
| * wnv1: Convert to the new bitstream readerAlexandra Hájková2016-11-241-5/+5
| |
| * vima: Convert to the new bitstream readerAlexandra Hájková2016-11-241-12/+12
| |
| * vble: Convert to the new bitstream readerAlexandra Hájková2016-11-241-13/+13
| |
| * utvideodec: Convert to the new bitstream readerAlexandra Hájková2016-11-241-7/+8
| |
| * twinvq: Convert to the new bitstream readerAlexandra Hájková2016-11-242-22/+22
| |
| * tscc2: Convert to the new bitstream readerAlexandra Hájková2016-11-241-15/+15
| |
| * truespeech: Convert to the new bitstream readerAlexandra Hájková2016-11-241-43/+45
| |
| * tiertex: Convert to the new bitstream readerAlexandra Hájková2016-11-241-12/+14
| |
| * truemotion2: Convert to the new bitstream readerAlexandra Hájková2016-11-241-20/+20
| |
| * svq1dec: Convert to the new bitstream readerAlexandra Hájková2016-11-241-60/+60
| |
| * smacker: Convert to the new bitstream readerAlexandra Hájková2016-11-241-68/+75
| |
| * sipr: Convert to the new bitstream readerAlexandra Hájková2016-11-241-12/+12
| |
| * rtjpeg: Convert to the new bitstream readerAlexandra Hájková2016-11-241-19/+23
| |
| * ra288: Convert to the new bitstream readerAlexandra Hájková2016-11-241-5/+5
| |
| * ra144: Convert to the new bitstream readerAlexandra Hájková2016-11-241-11/+12
| |
* | Merge commit '79566ec8c77969d5f9be533de04b1349834cca62'James Almer2017-04-040-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '79566ec8c77969d5f9be533de04b1349834cca62': arm: vp9itxfm: Rename a macro parameter to fit better This commit is a noop, see f69dd26df55539072dc2fa340384f808b5b3d3e1 Merged-by: James Almer <jamrial@gmail.com>
| * arm: vp9itxfm: Rename a macro parameter to fit betterMartin Storsjö2016-11-231-7/+7
| | | | | | | | | | | | | | | | | | Since the same parameter is used for both input and output, the name inout is more fitting. This matches the naming used below in the dmbutterfly macro. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '721bc37522c5c1d6a8c3cea5e9c3fcde8d256c05'James Almer2017-04-040-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '721bc37522c5c1d6a8c3cea5e9c3fcde8d256c05': arm/aarch64: vp9itxfm: Fix indentation of macro arguments This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * arm/aarch64: vp9itxfm: Fix indentation of macro argumentsMartin Storsjö2016-11-232-12/+12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '06fec74cacbb0ef7f3e5ea0e6c9ced1b6fd7565d'James Almer2017-04-040-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '06fec74cacbb0ef7f3e5ea0e6c9ced1b6fd7565d': checkasm: vp9dsp: benchmark all sub-IDCTs (but not WHT or ADST). This commit is a noop, see 1c8fbd7b90469f69fe3a3f78ba7886195d97c34f Merged-by: James Almer <jamrial@gmail.com>
| * checkasm: vp9dsp: benchmark all sub-IDCTs (but not WHT or ADST).Ronald S. Bultje2016-11-231-7/+14
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'effc1430b2fe5997d9d55bf28dc507c27125eb27'James Almer2017-04-041-6/+0
|\ \ | |/ | | | | | | | | | | * commit 'effc1430b2fe5997d9d55bf28dc507c27125eb27': Revert "checkasm: vp9dsp: Benchmark the dc-only version of idct_idct separately" Merged-by: James Almer <jamrial@gmail.com>
| * Revert "checkasm: vp9dsp: Benchmark the dc-only version of idct_idct separately"Martin Storsjö2016-11-231-6/+0
| | | | | | | | | | | | | | | | | | This reverts commit 81d7f0bbca837afda1f7e60d3ae52ab1360ab44b. Instead of just benchmarking dc separately, test all relevant subparts (in the next commit). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '12ab667e219e7fbf8e9aef3731039b75c822df25'James Almer2017-04-040-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '12ab667e219e7fbf8e9aef3731039b75c822df25': matroska: use av_stream_add_side_data() for stereo3d side data mov: Use av_stream_add_side_data() for displaymatrix side data utils: Add av_stream_add_side_data() This is a noop, see 2ab50647ff653ab45d9d78203b6a671124609991 77f033eb98d0d7d05f3aa238409d87fb1f6096b3 2343f23e4d7e0d0f6adfd83d7d769a7a115dbd17 Merged-by: James Almer <jamrial@gmail.com>
| * 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-234-11/+46
| | | | | | | | | | | | | | | | 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>
* | Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'James Almer2017-04-042-1/+3
|\ \ | |/ | | | | | | | | | | * commit '286ab878bd39b56008035638227b3ecb8ec5bbb7': fate.sh: Allow setting other make flags for running tests Merged-by: James Almer <jamrial@gmail.com>
| * fate.sh: Allow setting other make flags for running testsMartin Storsjö2016-11-232-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | If makeopts_fate is set, these makeopts are used for running the tests instead of the normal makeopts. If it isn't set, the normal makeopts variable is used as before. This is useful if remote testing on a lesser machine where a large number of parallel jobs might be undesireable, while wanting to speed up the build with many parallel processes. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'aa498c3183236a93206b4a0e8225b9db0660b50d'James Almer2017-04-040-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'aa498c3183236a93206b4a0e8225b9db0660b50d': avpacket: fix leak on realloc in av_packet_add_side_data() This commit is a noop, see 574929d8b6de32ae712fcca7ab09f01a3e4616be Merged-by: James Almer <jamrial@gmail.com>
| * avpacket: fix leak on realloc in av_packet_add_side_data()James Almer2016-11-231-3/+4
| | | | | | | | | | | | | | | | | | If realloc fails, the pointer is overwritten and the previously allocated buffer is leaked, which goes against the expected functionality of keeping the packet unchanged in case of error. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65'James Almer2017-04-041-7/+10
|\ \ | |/ | | | | | | | | | | * commit 'c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65': examples/decode_video: allocate the packet dynamically Merged-by: James Almer <jamrial@gmail.com>
| * examples/decode_video: allocate the packet dynamicallyAnton Khirnov2016-11-231-5/+8
| | | | | | | | AVPackets on stack are discouraged.
* | Merge commit '728ea23cce07467b732f538c87c13da13dd6dcf3'James Almer2017-04-041-22/+23
|\ \ | |/ | | | | | | | | | | * commit '728ea23cce07467b732f538c87c13da13dd6dcf3': examples/decode_video: switch to the new decoding API Merged-by: James Almer <jamrial@gmail.com>
| * examples/decode_video: switch to the new decoding APIAnton Khirnov2016-11-231-20/+23
| |
* | Merge commit 'f78d360bba6dcfb585847a49a84e89c25950fbdb'James Almer2017-04-041-54/+56
|\ \ | |/ | | | | | | | | | | * commit 'f78d360bba6dcfb585847a49a84e89c25950fbdb': examples/decode_video: use a parser for splitting the input Merged-by: James Almer <jamrial@gmail.com>
| * examples/decode_video: use a parser for splitting the inputAnton Khirnov2016-11-231-57/+56
| | | | | | | | | | Do not rely on the decoder handling this, as it's not guaranteed to work.
* | doc/examples/extract_mvs: re-indent after previous commitMatthieu Bouron2017-04-041-28/+28
| |
* | doc/examples/extract_mvs: make pkt local to the main functionMatthieu Bouron2017-04-041-12/+6
| |
* | doc/examples/extract_mvs: switch to new decoding APIMatthieu Bouron2017-04-041-37/+35
| |
OpenPOWER on IntegriCloud