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
80,024 Commits 39 Branches 425 Tags
d55568d22a5a6e59c087b8614227d5a0a3da4164
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Derek Buitenhuis e811ebcd9c Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7' 
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
  intrax8: Remove mpegvideo dependency

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:41:27 +01:00
Derek Buitenhuis f2c7812839 Merge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b' 
* commit '6ebd06a9b2508747a135ee4c880d8f612e08932b':
  intrax8: Drop lots of pointless parentheses

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:40:21 +01:00
Derek Buitenhuis 741960e2f3 Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c' 
* commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c':
  intrax8: Drop MB emulation code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:40:05 +01:00
Derek Buitenhuis f110c624b1 Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000' 
* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
  intrax8: Keep a reference to the decoder blocks

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:39:44 +01:00
Derek Buitenhuis c59c792470 Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f' 
* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
  intrax8: Use the generic horizband function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:37:32 +01:00
Derek Buitenhuis 123fef54cc Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b' 
* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
  intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:36:54 +01:00
Derek Buitenhuis 578fb5a27d Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3' 
* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
  intrax8: Pass macroblock size to ff_intrax8_common_init

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:35:20 +01:00
Derek Buitenhuis eee5a7cd7d Merge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54' 
* commit '9f4d99138df434a73b097c997fb4cafc65f4ff54':
  fate: Add test for WMV2 with jframes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-07 21:34:07 +01:00
Derek Buitenhuis 7966ddfc0b Merge commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33' 
* commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33':
  h264: reimplement 3aa661ec5 in a more explicit way

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 13:42:38 +01:00
Derek Buitenhuis a454ad670c Merge commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe' 
* commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe':
  svq3: drop the build dependency on the h264 decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:57:36 +01:00
Derek Buitenhuis 43b7e5aa32 Merge commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4' 
* commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4':
  svq3: eliminate remaining H264Context usage.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:52:14 +01:00
Derek Buitenhuis 2a018be10f Merge commit '7bbdae81e895a49125dba58bad01b98389966c39' 
* commit '7bbdae81e895a49125dba58bad01b98389966c39':
  svq3: move block_offset to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:27:55 +01:00
Derek Buitenhuis f32a23c849 Merge commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc' 
* commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc':
  svq3: stop using H264Context.gb

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:27:24 +01:00
Derek Buitenhuis 8bba752ae9 Merge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690' 
* commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690':
  svq3: move the frame num variables to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:24:33 +01:00
Derek Buitenhuis 014fb816d1 Merge commit '21b746932241246be846a133abb3c5f91b1cab85' 
* commit '21b746932241246be846a133abb3c5f91b1cab85':
  svq3: eliminate H264Context.cur_pic usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:24:08 +01:00
Derek Buitenhuis 2d3cc682c4 Merge commit '939b388383db8d0db5b2ff483e3a197c27b79791' 
* commit '939b388383db8d0db5b2ff483e3a197c27b79791':
  svq3: eliminate remaining H264SliceContext usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:23:23 +01:00
Derek Buitenhuis 5db920bcb6 Merge commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e' 
* commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e':
  svq3: move pict_type to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:17:34 +01:00
Derek Buitenhuis 1bfbdb8f0b Merge commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c' 
* commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c':
  svq3: move mb strides/sizes to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:15:54 +01:00
Derek Buitenhuis 297e2768da Merge commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba' 
* commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba':
  svq3: move the dequant buffer to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:15:22 +01:00
Derek Buitenhuis 6f784c158b Merge commit '549fc77273636d0d02175362af5dcd60c79f7633' 
* commit '549fc77273636d0d02175362af5dcd60c79f7633':
  svq3: move mb2br_xy to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:52:02 +01:00
Derek Buitenhuis f09fd96cee Merge commit '99dde60391cade40ae026b9e385a5280be6b9882' 
* commit '99dde60391cade40ae026b9e385a5280be6b9882':
  svq3: move {ref,mv}_cache to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:49:19 +01:00
Derek Buitenhuis c0b51aa2d2 Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8' 
* commit '89a13998a1b5074411dff5a461dce3837057b0b8':
  svq3: rip out the svq3-relevant parts of pred_motion() out of h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:48:30 +01:00
Derek Buitenhuis fed686af23 Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f' 
* commit '8eecae77ff6e2923de57dd883421d24fd53ca61f':
  svq3: move edge_emu_buffer to the SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:47:52 +01:00
Derek Buitenhuis 463de5625b Merge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe' 
* commit '527bf5f7c6890664b0f1dccd42397f4d204659fe':
  svq3: move the pred mode variables to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:46:54 +01:00
Derek Buitenhuis a2922b5d61 Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad' 
* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
  h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:34:40 +01:00
Derek Buitenhuis c18535399d Merge commit '1877712c586df2261f2806f45388c77592b89d1e' 
* commit '1877712c586df2261f2806f45388c77592b89d1e':
  svq3: move mb_{x,y,xy} to SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:07:47 +01:00
Derek Buitenhuis 7dca134285 Merge commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600' 
* commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600':
  svq3: eliminate write_back_intra_pred_mode() usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:07:19 +01:00
Derek Buitenhuis 47bb289170 Merge commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3' 
* commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3':
  svq3: add all the required dsp contexts into SVQ3Context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:06:42 +01:00
Derek Buitenhuis 656b071a8f Merge commit '15b0517da986b312fc2fcb364a92db328380b15b' 
* commit '15b0517da986b312fc2fcb364a92db328380b15b':
  svq3: make the dsp functions static

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:06:12 +01:00
Derek Buitenhuis d6f01c61ed Merge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776' 
* commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776':
  h264: remove the svq3-specific code

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 15:48:00 +01:00
Derek Buitenhuis f8d1bb2f2c Merge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c' 
* commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c':
  svq3: rip out the mb decoding code shared with h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 15:11:59 +01:00
Derek Buitenhuis ee38234c43 Merge commit 'e481458bc308ee838deaeacac51929514762e7a7' 
* commit 'e481458bc308ee838deaeacac51929514762e7a7':
  h264: factor out pred weight table parsing into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 15:04:29 +01:00
Derek Buitenhuis 79aafd43fd Merge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386' 
* commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386':
  h2645_parse: compute the actual data length, without trailing paddding

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 14:27:35 +01:00
Derek Buitenhuis 438ed974b8 Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977' 
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
  h2645_parse: add support for parsing h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 14:07:03 +01:00
Derek Buitenhuis b5c10c4c92 Merge commit '52ec149fbee57b6ca817049c9706212a0774a32c' 
* commit '52ec149fbee57b6ca817049c9706212a0774a32c':
  h2645_parse: change the AVCodecContext* parameter to void*

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 14:04:48 +01:00
Derek Buitenhuis 8e73574d4f Merge commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe' 
* commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe':
  h2645_parse: add a function for uninitializing the packet

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 14:01:45 +01:00
Derek Buitenhuis 3c4ca4c5d7 Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6' 
* commit 'fa936a307f5cddfc2664600157a8207ca8080af6':
  hevc_parse: rename into h2645_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 13:56:47 +01:00
Derek Buitenhuis 492d229303 qsvenc_hevc: Fix usage of ff_hevc_extract_rbsp 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-25 20:03:23 +01:00
Derek Buitenhuis 4791a910c0 lavc/hevc_parse: Don't take a HEVCContext 
It's not even used anymore, and the checks are no longer
functionally important.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-25 14:40:33 +01:00
Derek Buitenhuis 87b8e95008 Merge commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873' 
* commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873':
  aarch64: Make transpose_4x4H do a regular transpose

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-24 12:51:42 +01:00
Derek Buitenhuis 4fe4c5c376 Merge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e' 
This merge is a no-op.

* commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e':
  rtpdec_jpeg: fix low contrast image on low quality setting

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-24 12:49:00 +01:00