summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'Derek Buitenhuis2016-05-0917-76/+139
|\ | | | | | | | | | | | | * commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec': build: miscellaneous cosmetics Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: miscellaneous cosmeticsDiego Biurrun2016-04-0718-92/+153
| | | | | | | | | | | | Restore alphabetical order in lists, break overly long lines, do some prettyprinting, add some explanatory section comments, group parts together that belong together logically.
* | libavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOptionPrzemysław Sobala2016-05-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_fps: set fps value boundariesPrzemysław Sobala2016-05-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'Derek Buitenhuis2016-05-081-23/+23
|\ \ | |/ | | | | | | | | | | * commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330': configure: cosmetics: Drop pointless end-of-line semicolons Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * configure: cosmetics: Drop pointless end-of-line semicolonsDiego Biurrun2016-04-071-26/+26
| |
* | Merge commit '00658253e237ab975ae2d384e02b5936781f103d'Derek Buitenhuis2016-05-084-1/+19
|\ \ | |/ | | | | | | | | | | * commit '00658253e237ab975ae2d384e02b5936781f103d': fate: Update DDS tests Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * fate: Update DDS testsVittorio Giovara2016-04-064-1/+7
| |
* | Merge commit '22e49e6edead9c83696f20127988f659b952ce65'Derek Buitenhuis2016-05-081-5/+1
|\ \ | |/ | | | | | | | | | | * commit '22e49e6edead9c83696f20127988f659b952ce65': dds: Simplify postprocessing check Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dds: Simplify postprocessing checkVittorio Giovara2016-04-061-3/+1
| |
* | Merge commit '02538636261fdec9c70f4185b23147c636f269b4'Derek Buitenhuis2016-05-081-0/+2
|\ \ | |/ | | | | | | | | | | * commit '02538636261fdec9c70f4185b23147c636f269b4': dds: Add support for alpha-only files Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dds: Add support for alpha-only filesVittorio Giovara2016-04-061-0/+2
| | | | | | | | | | | | | | Due to how pixel format conversion is done, they behave the same way as gray files. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'Derek Buitenhuis2016-05-081-0/+4
|\ \ | |/ | | | | | | | | | | * commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc': dds: Add support for rgb555 files Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dds: Add support for rgb555 filesVittorio Giovara2016-04-061-0/+4
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'Derek Buitenhuis2016-05-084-2/+33
|\ \ | |/ | | | | | | | | | | * commit '8dde92b95a197eb809d798aacb34dbe52a0689a8': fate: Update Screenpresso tests Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * fate: Update Screenpresso testsVittorio Giovara2016-04-044-2/+25
| |
* | Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'Derek Buitenhuis2016-05-081-4/+3
|\ \ | |/ | | | | | | | | | | * commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf': screenpresso: Correctly handle keyframes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * screenpresso: Correctly handle keyframesVittorio Giovara2016-04-041-4/+3
| | | | | | | | | | | | | | | | The first byte contains compression level together with keyframe status. When a frame is not interpreted correctly, its data is summed to the reference, and would degrade over time, producing an incorrect result. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'Derek Buitenhuis2016-05-081-15/+31
|\ \ | |/ | | | | | | | | | | * commit '95db8c757cb003a71b040b567f38be74151deb5c': screenpresso: Add extended pixel format support Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * screenpresso: Add extended pixel format supportVittorio Giovara2016-04-041-15/+31
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'Derek Buitenhuis2016-05-085-2/+53
|\ \ | |/ | | | | | | | | | | * commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914': fate: Update RSCC tests Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * fate: Update RSCC testsVittorio Giovara2016-04-045-2/+41
| | | | | | | | | | | | The current sample comes from an older version of the codec, which supports a single output mode, so rename it accordingly. Add tests for the new pixel formats.
* | Merge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b'Derek Buitenhuis2016-05-081-8/+34
|\ \ | |/ | | | | | | | | | | * commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b': rscc: Add extended pixel format support Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * rscc: Add extended pixel format supportVittorio Giovara2016-04-041-8/+37
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'Derek Buitenhuis2016-05-080-0/+0
|\ \ | |/ | | | | | | | | | | | | | | This commit is a no-op. * commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae': nvenc_h264: Fix name of private AVClass Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * nvenc_h264: Fix name of private AVClassDiego Biurrun2016-04-041-2/+2
| |
* | Merge commit 'e3453fd44480d903338c663238bf280215dd9a07'Derek Buitenhuis2016-05-083-27/+68
|\ \ | |/ | | | | | | | | | | * commit 'e3453fd44480d903338c663238bf280215dd9a07': matroska: Write the field order information Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * matroska: Write the field order informationLuca Barbato2016-04-034-28/+69
| | | | | | | | And bump the document version to 4.
* | Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'Derek Buitenhuis2016-05-080-0/+0
|\ \ | |/ | | | | | | | | | | | | | | This commit is a no-op. We cherry picked it earlier. * commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d': vaapi_h264: Fix bit offset of slice data. Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * vaapi_h264: Fix bit offset of slice data.Mark Thompson2016-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Commit ca2f19b9cc37be509d85f05c8f902860475905f8 modified the meaning of H264SliceContext.gb: it is now initialised at the start of the NAL unit header, rather than at the start of the slice header. The VAAPI slice decoder uses the offset after parsing to determine the offset of the slice data in the bitstream, so with the changed meaning we no longer need to add the extra byte to account for the NAL unit header because it is now included directly. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '33275a0de05e9bc321f2537a2a67921fab81624f'Derek Buitenhuis2016-05-081-2/+3
|\ \ | |/ | | | | | | | | | | * commit '33275a0de05e9bc321f2537a2a67921fab81624f': ac3dec: change logging of skipped E-AC-3 substreams. Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * ac3dec: change logging of skipped E-AC-3 substreams.Tim Walker2016-04-021-2/+3
| | | | | | | | | | | | | | | | | | Change log level from warning to debug: the E-AC-3 "core" substream can be successfully decoded without the additional and dependent substreams, and their presence is already indicated via avpriv_request_sample in ff_eac3_parse_header. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'fef2147b7a689b80d716c3edb9d4a18904865275'Derek Buitenhuis2016-05-082-2/+10
|\ \ | |/ | | | | | | | | | | * commit 'fef2147b7a689b80d716c3edb9d4a18904865275': eac3dec: don't call avpriv_request_sample every frame. Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * eac3dec: don't call avpriv_request_sample every frame.Tim Walker2016-04-022-2/+10
| | | | | | | | | | | | | | | | These errors neither prevent nor stop successful decoding of the E-AC-3 stream's "core", causing avpriv_request_sample to be called for every single frame in the bitstream. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'Derek Buitenhuis2016-05-080-0/+0
|\ \ | |/ | | | | | | | | | | * commit '1db8eb154908cde577477b6ab17430a0cd46b7bd': avconv: Drop an unused variable Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avconv: Drop an unused variableLuca Barbato2016-04-011-1/+0
| |
* | Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'Derek Buitenhuis2016-05-082-1/+47
|\ \ | |/ | | | | | | | | | | * commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43': jack: Support OSX Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * jack: Support OSXJosh de Kock2016-03-312-1/+51
| | | | | | | | | | | | | | | | | | Previously, with JACK installed, the configure script would enable the JACK indev; this broke on OS X due to an incomplete pthreads implementation. Add some simple macros to map libdispatch to pthreads on OS X. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'Derek Buitenhuis2016-05-082-2/+45
|\ \ | |/ | | | | | | | | | | * commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1': matroska: Support interlaced content correctly Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * matroska: Support interlaced content correctlyLuca Barbato2016-03-312-1/+43
| | | | | | | | The matroska specification now has two elements for it.
* | Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'Derek Buitenhuis2016-05-081-1/+1
|\ \ | |/ | | | | | | | | | | * commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954': build: Do not check the vaapi_encode.h header if VAAPI is not enabled Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: Do not check the vaapi_encode.h header if VAAPI is not enabledDiego Biurrun2016-03-301-1/+1
| |
* | Merge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d'Derek Buitenhuis2016-05-080-0/+0
|\ \ | |/ | | | | | | | | | | * commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d': Mark tables used only within their files as static Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * Mark tables used only within their files as staticDiego Biurrun2016-03-302-4/+4
| |
* | Merge commit '061dc20351bf3b8a237216d2b39d3a3b736d1916'Derek Buitenhuis2016-05-080-0/+0
|\ \ | |/ | | | | | | | | | | * commit '061dc20351bf3b8a237216d2b39d3a3b736d1916': h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables() Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()Diego Biurrun2016-03-303-4/+4
| |
* | Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'Derek Buitenhuis2016-05-080-0/+0
|\ \ | |/ | | | | | | | | | | * commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628': avconv: fix -frames for video Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * avconv: fix -frames for videoAnton Khirnov2016-03-301-6/+6
| | | | | | | | | | | | For video, frame_number tracks the number of frames sent to the encoder. So it should be incremented when we submit a frame, not when we get a packet back.
* | Merge commit '83f230c2445a94fdd94c66504482217fcece5909'Derek Buitenhuis2016-05-085-1/+426
|\ \ | |/ | | | | | | | | | | * commit '83f230c2445a94fdd94c66504482217fcece5909': lavc: VAAPI MJPEG encoder Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: VAAPI MJPEG encoderMark Thompson2016-03-305-1/+426
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
OpenPOWER on IntegriCloud