virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
87,186 Commits 39 Branches 425 Tags
e6e58de03d6048f8cb7233881465ec6288c7cf7f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Buitenhuis add7b3bc3f utils: Do not expand a macro with 'defined' in it 
Fixes:

    libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]
    #if USE_MMAP
        ^
    libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP'
    #define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS)
                                                    ^
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-08-25 13:44:57 +01:00
Derek Buitenhuis 9e02f35f6a mjpeg: Add support for ICC side data 
JPEGs store embedded profiles under the APP2 marker, signified
with a "ICC_PROFILE" null-terminated string header, and can be
split across multiple APP2 markers, out of order.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-08-25 13:44:41 +01:00
Derek Buitenhuis a27c412795 webmdashenc: Fix memory leak 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-16 16:09:17 +01:00
Derek Buitenhuis e10c31f331 hdsenc: Remove dead store 
This is apparently not supposed to error out anyway.

Reviewed-by: Steven Liu <lq@onvideo.cn>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-14 13:48:56 +01:00
Derek Buitenhuis 5ca063799c rtspdec: Fix return error 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-10 15:02:29 -04:00
Derek Buitenhuis 51db262312 bitstream_filter: Add missing error check 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:32:37 -04:00
Derek Buitenhuis b198e09138 af_amix: Add missing error check 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:32:03 -04:00
Derek Buitenhuis c27d7c027c rtmpproto: Fix error return 
Mistake was added in 5840473890.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:30:57 -04:00
Derek Buitenhuis aa2bc61a3e cngenc: Remove dead store 
ff_lpc_calc_ref_coeffs returns the order it is given and cannot return
in error.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:29:57 -04:00
Derek Buitenhuis d74ba68acf ffmpeg_opt: Make get_timecode actually return errors 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:27:22 -04:00
Derek Buitenhuis 179bf86fa2 opusdec: Remove dead code 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:26:35 -04:00
Derek Buitenhuis f7daed8545 scpr: Added missing error check 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:25:46 -04:00
Derek Buitenhuis 704b774ae0 af_tempo: Add missing error check 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:24:49 -04:00
Derek Buitenhuis b603ef0870 bitpacked: Remove dead store 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 15:23:58 -04:00
Derek BuitenhuisandSteven Liu 2d417076a2 avformat/hlsenc: Add missing error check 
Reviewed-by: Steven Liu <lq@onvideo.cn>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-07 10:08:18 +08:00
Derek Buitenhuis fde9013ab4 mpegtsenc: Don't pass NULL to memcpy 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-06 21:28:20 -04:00
Derek Buitenhuis 99c68861f9 concatdec: Do not pass NULL to memcmp 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-07-06 15:35:32 -04:00
Derek Buitenhuis 6ba1c9bf7e webm_dash_manifest_demuxer: Fix initialization range for files with cues at the front 
The WebM DASH spec states:
    The Initialization Segment shall not contain Clusters or Cues.
    The Segment Index corresponds to the Cues.

Previously, it included the cues if they were at the front.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-04-23 17:52:58 +01:00
Derek Buitenhuis 8e6b9ef473 webm_dash_manifest_demuxer: Fix UB in cue timestamp string code and make it actually work 
Output was apparently not tested for correctness. Passing overlapping
memory to snprintf causes undefined behavior, and usually resulted in
only the very last timestamp being written to metadata, and not a list
at all.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-04-23 17:51:41 +01:00
Derek BuitenhuisandMichael Niedermayer ec07efa700 avformat/webmdashenc: Validate the 'streams' adaptation sets parameter 
It should not be a value larger than the number of streams we have,
or it will cause invalid reads and/or SIGSEGV.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-20 18:07:32 +02:00
Derek BuitenhuisandMichael Niedermayer cbd3a68f3e avformat/webmdashenc: Require the 'adaptation_sets' option to be set 
This seems to be non-optional, and if the muxer is run without it,
strlen() is run on NULL, causing a segfault.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-20 18:07:32 +02:00
Derek BuitenhuisandMichael Niedermayer 91ed4e7196 avcodec: Mark some codecs with threadsafe init as such 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-02-07 23:31:25 +01:00
Derek BuitenhuisandAnton Khirnov 00b775dda2 hevc: Mark as having threadsafe init 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2017-01-19 09:51:15 +01:00
Derek Buitenhuis 14b9060160 hevc: Mark as having threadsafe init 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-01-11 12:21:43 -05:00
Derek BuitenhuisandAnton Khirnov e94b9313b2 fate: Add h264 test for frame num gaps 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-12-14 11:01:50 +01:00
Derek BuitenhuisandAnton Khirnov 5c7f2cf81d h264_slice: Wait for refs to be available before we use them in error concealment 
This could happen when there was a frame number gap and frame threading was used.

Debugging-by: Ronald S. Bultje <rsbultje@gmail.com>
Debugging-by: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-12-14 10:38:15 +01:00
Derek Buitenhuis b7e4ea0c80 fate: Add h264 test for frame num gaps 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-12-12 13:33:52 +00:00
Derek Buitenhuis 51c673a0d7 libavcodec/tests: Add avpacket test to .gitignore 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-12-10 15:51:01 +00:00
Derek Buitenhuis 4413e950b2 h264_slice: Wait for refs to be available before we use them in error concealment 
This could happen when there was a frame number gap and frame threading was used.

This fixes #5458.

Debugging-by: Ronald S. Bultje <rsbultje@gmail.com>
Debugging-by: Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-12-09 15:00:29 +00:00
Derek BuitenhuisandMartin Storsjö db0b3dccb3 libx265: Add option to force IDR frames 
This is in the same the same vein as 380146924e.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2016-11-07 10:16:10 +02:00
Derek BuitenhuisandMichael Niedermayer b54fd42d7d doc/libx26[45]: Add documentation for forced-idr 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-06 15:26:08 +01:00
Derek BuitenhuisandMichael Niedermayer 8a8902f221 libx265: Add option to force IDR frames 
This is in the same the same vein as c981b1145a.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-04 02:45:51 +01:00
Derek BuitenhuisandMichael Niedermayer dfe7e5501d FATE: Add test for muxing discontinuous MP4 fragments with large timestamps 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-10-19 13:25:21 +02:00
Derek BuitenhuisandLuca Barbato 8db804e8f5 mov: Remove old b-frame/video delay heuristic 
This was added before edts support existed, and is no longer
valid.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-08-29 15:31:03 +02:00
Derek BuitenhuisandLuca Barbato eb96505b76 mov: Remove ancient heuristic hack 
This breaks files with legitimate single-entry edit lists,
and the hack, introduced in f03a081df0,
has no link to any known sample in its commit message.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-08-29 15:31:03 +02:00
Derek BuitenhuisandPaul B Mahol 425be3c810 mov: Remove old b-frame/video delay heuristic 
This was added before edts support existed, and is no longer
valid.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-08-25 21:12:30 +02:00
Derek BuitenhuisandPaul B Mahol 04f8d31287 mov: Remove ancient heuristic hack 
This breaks files with legitimate single-entry edit lists,
and the hack, introduced in f03a081df0,
has no link to any known sample in its commit message.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-08-25 21:12:19 +02:00
Derek BuitenhuisandPaul B Mahol 26695aedc2 docs/filters: Fix parameter names for colorspace filter 
They were erroneously set to the name of the unit instead of
the parameter name.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-08-08 23:39:31 +02:00
Derek BuitenhuisandPaul B Mahol a02766fb4d avcodec: remove libutvideo wrapper support 
The 10-bit decoding support is available now in native decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-06-23 13:04:11 +02:00
Derek BuitenhuisandLou Logan cc4ab320cf MAINTAINERS: Remove myself 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-06-02 09:25:37 -08:00
Derek BuitenhuisandAnton Khirnov d68fb14758 mjpegdec: Properly fail on malloc failure 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-05-19 13:44:41 +02:00
Derek Buitenhuis d55568d22a Merge commit '71d3305c2711d4f6ec8b92db09ff64cf4e19a58e' 
* commit '71d3305c2711d4f6ec8b92db09ff64cf4e19a58e':
  h264_parse: make sure the ref count is zeroed on all failure paths

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-17 15:18:43 +01:00
Derek Buitenhuis 278dcec28d Merge commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa' 
* commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa':
  h264: factor out parsing the reference count into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-17 15:16:38 +01:00
Derek Buitenhuis 6b295bccbb Merge commit '56b17a33f231859cbccbd741b4763617cb4ecf03' 
* commit '56b17a33f231859cbccbd741b4763617cb4ecf03':
  h264: stop testing whether the reference count changes in ff_set_ref_count()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-17 14:55:36 +01:00
Derek Buitenhuis 7ab2c036b9 Merge commit 'e9f884416c76558098fc1f63825b293956e8483c' 
* commit 'e9f884416c76558098fc1f63825b293956e8483c':
  h264: move reading direct_spatial_mv_pred out of ff_set_ref_count()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-17 14:38:14 +01:00
Derek Buitenhuis 97946b20b6 Merge commit 'f3ed484953b81856e40239d2410058a96188b2be' 
* commit 'f3ed484953b81856e40239d2410058a96188b2be':
  h264_mp4toannexb_bsf: do not fail on annex B extradata

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:34:03 +01:00
Derek Buitenhuis 5b9a4476e3 Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e' 
* commit '5fca95c8e515a5ae542d9626ec088bdfc658450e':
  libx264: Forbid inverted Stereo3D mode

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:29:34 +01:00
Derek Buitenhuis e3cfd1b275 Merge commit '9e2af0e9071a1229cfe21efff394691d91f979b2' 
* commit '9e2af0e9071a1229cfe21efff394691d91f979b2':
  libx264: Allow Stereo3D monoscopic value

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:29:09 +01:00
Derek Buitenhuis d4acf9f2dd Merge commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6' 
* commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6':
  build: Silence the lcov-reset target

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:28:23 +01:00
Derek Buitenhuis 1549ca4267 Merge commit '75b90ef722b7cdfc70118ab987e298d087aae693' 
* commit '75b90ef722b7cdfc70118ab987e298d087aae693':
  libavformat: Update the comment about AVOutputFormat flags

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:27:54 +01:00
Derek Buitenhuis ee96b7b1c6 Merge commit '74383def8f46805faf3391c98516b248108a9a6b' 
* commit '74383def8f46805faf3391c98516b248108a9a6b':
  movenc: Handle pts == NOPTS when autoflushing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:27:34 +01:00
Derek Buitenhuis a022c1fe76 Merge commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da' 
* commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da':
  movenc: Update a comment to reflect how the code actually behaves

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:27:01 +01:00
Derek Buitenhuis a2906846da Merge commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89' 
This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.

* commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89':
  img2enc: Refactor the atomic renaming code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:26:19 +01:00
Derek Buitenhuis 22900770c5 Merge commit 'f3fdef108eb06b1e71b29152bf6822519e787efe' 
* commit 'f3fdef108eb06b1e71b29152bf6822519e787efe':
  ape: Avoid undefined behaviour

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:20:51 +01:00
Derek Buitenhuis 3fd5f09845 Merge commit '6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5' 
This commit is a no-op.

* commit '6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5':
  indeo3: Avoid undefined behaviour

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:18:49 +01:00
Derek Buitenhuis f8a4b8bc40 Merge commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f' 
* commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f':
  libxvid: Create extradata in init using a dummy frame

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:18:02 +01:00
Derek Buitenhuis 92d934106c Merge commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b' 
* commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b':
  pixfmt: fix wrong comment

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:17:13 +01:00
Derek Buitenhuis 9f8a942d6a Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477' 
* commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477':
  Generate the lists of enabled protocols/bsfs from configure.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-12 14:04:02 +01:00
Derek Buitenhuis f693184557 Split drawutils test out into separate file 
This was missed during 96d616052b because
it is not included in FATE.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 20:43:19 +01:00
Derek Buitenhuis 64fbf2f03e avfft-test: Add missing mem.h include 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 20:42:55 +01:00
Derek Buitenhuis c71c3b9ff4 Merge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5' 
* commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5':
  hwcontext: initialize sw_format in av_hwframe_ctx_alloc()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:46:17 +01:00
Derek Buitenhuis ed8bacfb5c Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a' 
* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
  lavc: move the vaapi encoders further down in the list of codecs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:45:20 +01:00
Derek Buitenhuis 8ed427f9f9 Merge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12' 
These are all trivial to merge.

* commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12':
  vaapi_h265: Add -qp option, use it to replace use of -global_quality
  vaapi_h265: Add constant-bitrate encode support
  vaapi_h264: Add encode quality option (for quality-speed tradeoff)
  vaapi_h264: Add -qp option, use it to replace use of -global_quality
  vaapi_encode: Add support for codec-local options
  vaapi_h264: Add constant-bitrate encode support
  vaapi_encode: Refactor slightly to allow easier setting of global options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:40:39 +01:00
Derek Buitenhuis bc3d2f2578 Merge commit '18019f8cb9663dd1032c65aa453eaec18d641905' 
* commit '18019f8cb9663dd1032c65aa453eaec18d641905':
  FATE: add an H.264 test with unescaped extradata
  FATE: add an H.264 test with invalid reference lists

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:39:09 +01:00
Derek Buitenhuis 75a1fc0376 Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55' 
* commit '9d4d9be538faa537440fff37d3b7ecf322911a55':
  libavcodec: Document that encoders may use the framerate field in AVCodecContext

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:26:22 +01:00
Derek Buitenhuis ec1d8abfb9 Merge commit '1bb56abb9b37bd208a66164339c92cad59b1087b' 
* commit '1bb56abb9b37bd208a66164339c92cad59b1087b':
  omx: Add support for zerocopy input of frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:24:26 +01:00
Derek Buitenhuis e330ab0fb7 Merge commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658' 
* commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658':
  omx: Add support for broadcom OMX on raspberry pi

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:23:15 +01:00
Derek Buitenhuis 0e38723220 Merge commit 'e8919ec486a5559fdcf366e347be0656d904a87f' 
* commit 'e8919ec486a5559fdcf366e347be0656d904a87f':
  libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:19:28 +01:00
Derek Buitenhuis f4c88eef95 Merge commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf' 
* commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf':
  mmaldec: Use imgutils.h for copying frames

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:15:14 +01:00
Derek Buitenhuis 4f173d055c Merge commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f' 
* commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f':
  testprogs: Add missing libm.h includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:14:36 +01:00
Derek Buitenhuis 96d616052b Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13' 
* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13':
  build: Split test programs off into separate files

Some conversions done by: James Almer <jamrial@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 19:13:03 +01:00
Derek Buitenhuis ce3037ac8e Merge commit '330177b508420a553083df94f22cbd5142de0f4a' 
* commit '330177b508420a553083df94f22cbd5142de0f4a':
  build: Group declarations for hw-accelerated de-/encoding separately

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-11 15:19:06 +01:00
Derek Buitenhuis ca5ec2bf51 Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec' 
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-09 16:25:28 +01:00
Derek Buitenhuis 38eeb85ff3 Merge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330' 
* commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330':
  configure: cosmetics: Drop pointless end-of-line semicolons

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:57:32 +01:00
Derek Buitenhuis 68b8505d4d Merge commit '00658253e237ab975ae2d384e02b5936781f103d' 
* commit '00658253e237ab975ae2d384e02b5936781f103d':
  fate: Update DDS tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:55:28 +01:00
Derek Buitenhuis d62984d8a0 Merge commit '22e49e6edead9c83696f20127988f659b952ce65' 
* commit '22e49e6edead9c83696f20127988f659b952ce65':
  dds: Simplify postprocessing check

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:50:09 +01:00
Derek Buitenhuis 6ebec1049e Merge commit '02538636261fdec9c70f4185b23147c636f269b4' 
* commit '02538636261fdec9c70f4185b23147c636f269b4':
  dds: Add support for alpha-only files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:49:26 +01:00
Derek Buitenhuis 6c00703685 Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc' 
* commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc':
  dds: Add support for rgb555 files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:49:04 +01:00
Derek Buitenhuis 486776d06f Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8' 
* commit '8dde92b95a197eb809d798aacb34dbe52a0689a8':
  fate: Update Screenpresso tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:46:58 +01:00
Derek Buitenhuis 483e9d8a2b Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf' 
* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
  screenpresso: Correctly handle keyframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:43:55 +01:00
Derek Buitenhuis 5d31074daf Merge commit '95db8c757cb003a71b040b567f38be74151deb5c' 
* commit '95db8c757cb003a71b040b567f38be74151deb5c':
  screenpresso: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:43:35 +01:00
Derek Buitenhuis e4c8e19064 Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914' 
* commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914':
  fate: Update RSCC tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:41:40 +01:00
Derek Buitenhuis dd2d26dc82 Merge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b' 
* commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b':
  rscc: Add extended pixel format support

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:33:08 +01:00
Derek Buitenhuis f0d4f3026d Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae' 
This commit is a no-op.

* commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae':
  nvenc_h264: Fix name of private AVClass

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:27:22 +01:00
Derek Buitenhuis ee865e9780 Merge commit 'e3453fd44480d903338c663238bf280215dd9a07' 
* commit 'e3453fd44480d903338c663238bf280215dd9a07':
  matroska: Write the field order information

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:25:58 +01:00
Derek Buitenhuis 2d2af18f42 Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d' 
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>
 2016-05-08 23:07:55 +01:00
Derek Buitenhuis 13b77e09c7 Merge commit '33275a0de05e9bc321f2537a2a67921fab81624f' 
* commit '33275a0de05e9bc321f2537a2a67921fab81624f':
  ac3dec: change logging of skipped E-AC-3 substreams.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:07:01 +01:00
Derek Buitenhuis 15cb52577a Merge commit 'fef2147b7a689b80d716c3edb9d4a18904865275' 
* commit 'fef2147b7a689b80d716c3edb9d4a18904865275':
  eac3dec: don't call avpriv_request_sample every frame.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:05:22 +01:00
Derek Buitenhuis 9109b5240b Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd' 
* commit '1db8eb154908cde577477b6ab17430a0cd46b7bd':
  avconv: Drop an unused variable

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:04:53 +01:00
Derek Buitenhuis dc0152548f Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43' 
* commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43':
  jack: Support OSX

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 23:02:33 +01:00
Derek Buitenhuis f3972b3b7d Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1' 
* commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1':
  matroska: Support interlaced content correctly

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:58:18 +01:00
Derek Buitenhuis f93c409c0b Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954' 
* commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954':
  build: Do not check the vaapi_encode.h header if VAAPI is not enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:53:50 +01:00
Derek Buitenhuis 4c3732c881 Merge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d' 
* commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d':
  Mark tables used only within their files as static

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:52:40 +01:00
Derek Buitenhuis 630586af88 Merge commit '061dc20351bf3b8a237216d2b39d3a3b736d1916' 
* commit '061dc20351bf3b8a237216d2b39d3a3b736d1916':
  h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:51:09 +01:00
Derek Buitenhuis 3005ee372d Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628' 
* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628':
  avconv: fix -frames for video

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:50:46 +01:00
Derek Buitenhuis 939345854a Merge commit '83f230c2445a94fdd94c66504482217fcece5909' 
* commit '83f230c2445a94fdd94c66504482217fcece5909':
  lavc: VAAPI MJPEG encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:46:52 +01:00
Derek Buitenhuis a82d1a8c7a Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555' 
* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
  lavc: VAAPI H.265 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:45:39 +01:00
Derek Buitenhuis b975aeec02 Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0' 
* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
  lavc: VAAPI H.264 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:43:52 +01:00
Derek Buitenhuis 508957fd0f Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e' 
* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
  lavc: VAAPI encode common infrastructure

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:41:12 +01:00
Derek Buitenhuis 172d3568b3 Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f' 
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
  avconv: VAAPI hwcontext initialisation and hwaccel helper

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:39:39 +01:00