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
75,616 Commits 39 Branches 425 Tags
d3e5fbb1406995e07fccbff3ca8c1e24f57a1f7b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hendrik Leppkes a2426798d6 Merge commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b' 
* commit 'd00bb8addccb63fa3feacb06d2a310731dc0113b':
  mips: intreadwrite: Only execute that code for mips r1 or r2

Not merged, as FFmpeg has a separate condition to protect this code.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:35:07 +02:00
Hendrik Leppkes c096226ae6 Merge commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad' 
* commit '1016a75cf3170648dc9b59fdef170cbfc142f8ad':
  configure: mips: Support mips r6, r2 and r1

Not merge, as MIPS support in ffmpeg is handled
quite differently and I do not have an env to test.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:33:35 +02:00
Hendrik Leppkes 071f6edb98 Merge commit '678f788fea3380e5cbbf75baac5cc0ce07a56a42' 
* commit '678f788fea3380e5cbbf75baac5cc0ce07a56a42':
  configure: Set the initial ldflags to match the cflags

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:24:35 +02:00
Hendrik Leppkes 4d9b78a875 Merge commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc' 
* commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc':
  libopenh264enc: Use av_log() to log messages

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:23:45 +02:00
Hendrik Leppkes 27673f1bea Merge commit '8aecec84021a61b943718ff3d7c2c57fcd4af199' 
* commit '8aecec84021a61b943718ff3d7c2c57fcd4af199':
  qsvdec: make ff_qsv_decode_init() static

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:20:05 +02:00
Hendrik Leppkes b1284a4b4a Merge commit '539e5ac2ecfec2e2f441222a43fb0583643ea607' 
* commit '539e5ac2ecfec2e2f441222a43fb0583643ea607':
  examples/qsvdec: free the lavc decoder before closing MFX/VAAPI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:29 +02:00
Hendrik Leppkes d0a1605134 Merge commit '3ee462dca1038e63b8e8d5e751121736d5772a5d' 
* commit '3ee462dca1038e63b8e8d5e751121736d5772a5d':
  examples/qsvdec: do not free the surfaces in the frame_free() callback

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:23 +02:00
Hendrik Leppkes 9457a11a22 Merge commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2' 
* commit '2c32eace5ec4d1d7ca4e0220856cd2815ccc71b2':
  qsvdec: close the MFX decoder on uninit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:17:09 +02:00
Hendrik Leppkes 029aa8ff14 Merge commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a' 
* commit 'd0c8c380ecf3d9bb16621a4fb59ebbcde301002a':
  qsv: document AVQSVContext members

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:14:10 +02:00
Hendrik Leppkes 6668214521 Merge commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd' 
* commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd':
  qsvenc: mark the encoders as INIT_CLEANUP

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:12:47 +02:00
Hendrik Leppkes 49a25d02dd Merge commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc' 
* commit '83847cc8fa97e0fc637a0962bafb837acdb6eacc':
  qsvenc: do not try to close the encoder if the session is NULL

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 14:10:25 +02:00
Hendrik Leppkes 4554178f07 Merge commit '741b352b16dad74b87c4a39bade8902633a2b0e6' 
* commit '741b352b16dad74b87c4a39bade8902633a2b0e6':
  qsvdec: list supported pixel formats

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:53:42 +02:00
Hendrik Leppkes c36e85b3d9 Merge commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482' 
* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482':
  lavfi: do not exclude hwaccel formats from ff_all_formats()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:48:58 +02:00
Hendrik Leppkes 88dbdf4845 Merge commit 'cc285521000020ab237d183dc3a26f99fce3030f' 
* commit 'cc285521000020ab237d183dc3a26f99fce3030f':
  checkasm/x86: Correctly handle variadic functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:48:24 +02:00
Hendrik Leppkes fd0fa9af80 Merge commit '5405584b7b54ca889c341743de1d58792449830d' 
* commit '5405584b7b54ca889c341743de1d58792449830d':
  checkasm: Use a self-balancing tree

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:48:05 +02:00
Hendrik Leppkes d0bf83ff1d Merge commit 'a41e5e192ed8f79f6607f978dee3205580ba5039' 
* commit 'a41e5e192ed8f79f6607f978dee3205580ba5039':
  vdpau: fix constrained baseline fallback

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:45:38 +02:00
Hendrik Leppkes 4b7685b6c6 Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13' 
* commit 'cc8db760616a7ec3bd39b22ca45888c01326db13':
  mpegts: use avcodec_get_type() to set codec_type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:45:23 +02:00
Hendrik Leppkes 2f63e83c26 Merge commit 'a5d58fea68b9212e0065a71939e921505504a9bb' 
* commit 'a5d58fea68b9212e0065a71939e921505504a9bb':
  lavc: reimplement avcodec_get_type() using codec descriptors

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:45:19 +02:00
Hendrik Leppkes b123d82c41 Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526' 
* commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526':
  vdpau: deprecate av_vdpau_get_profile()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-29 13:44:59 +02:00
Hendrik Leppkes 9c3c8d2c56 Merge commit 'b2417ee6d1ee0c5e9b170a642d73bdf68908966f' 
* commit 'b2417ee6d1ee0c5e9b170a642d73bdf68908966f':
  dxv: Improve error message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:14:31 +02:00
Hendrik Leppkes b4ea8a7305 Merge commit '1bcd4a476ba45a7fdf59d1701b8f0e274418cc32' 
* commit '1bcd4a476ba45a7fdf59d1701b8f0e274418cc32':
  dxv: Support RAW intermediate compression

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:14:25 +02:00
Hendrik Leppkes f6048e4920 Merge commit 'bbf71d46db3417b43bcbd745cbf235e8e2ff69ae' 
* commit 'bbf71d46db3417b43bcbd745cbf235e8e2ff69ae':
  dxv: Print texture information after header parsing

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:14:01 +02:00
Hendrik Leppkes 234c7378ca Merge commit 'fb2889691cb7720d2680e188eb6036a35afa2392' 
* commit 'fb2889691cb7720d2680e188eb6036a35afa2392':
  dxv: Support the original first version

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:13:48 +02:00
Hendrik Leppkes d0aec0aae8 Merge commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3' 
* commit '588a5619da0d041e55b365f63d0fa9c72bdbd4d3':
  dxv: Parse ancillary encoder information

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:11:06 +02:00
Hendrik Leppkes 2b61cc4443 Merge commit 'a9b8c638cfe2f82191db65e3e3a39f3b35df81f5' 
* commit 'a9b8c638cfe2f82191db65e3e3a39f3b35df81f5':
  mmal: Fix AVBufferRef usage

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:07:54 +02:00
Hendrik Leppkes f3310df853 Merge commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff' 
* commit '49623f531972be5dc2dd8c1b4b8748cad7c424ff':
  mmal: Remove setting extradata on input format

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:07:44 +02:00
Hendrik Leppkes c5a312dd6a Merge commit 'f290e48d86e10f34b5ddc519127636bcebec7c43' 
* commit 'f290e48d86e10f34b5ddc519127636bcebec7c43':
  mmal: drop the h264 BSF

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-26 11:07:33 +02:00
Hendrik Leppkes 0118158efa hevc: properly handle no_rasl_output_flag when removing pictures from the DPB 
Fixes ticket #4185.

Reviewed-By: Mickael Raulet <Mickael.Raulet@insa-rennes.fr>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-20 00:17:32 +02:00
Hendrik Leppkes 3a8e447712 lavf/utils: remove some left-over cruft from the 32-bit size fields 2015-09-17 16:54:00 +02:00
Hendrik Leppkes e34939ca76 Merge commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e' 
* commit '7bb1c1bfd22de2200743af04ebd0c7c775f56f7e':
  avconv_opt: Allow printing private options

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:46:34 +02:00
Hendrik Leppkes 7c46f24bde Merge commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86' 
* commit 'e3d4784eb31b3ea4a97f2d4c698a75fab9bf3d86':
  d3d11va: WindowsPhone requires a mutex around ID3D11VideoContext

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:31:40 +02:00
Hendrik Leppkes ea33b1ea30 Merge commit '781a25e9c419dd66063597cc5d70e8919de60561' 
* commit '781a25e9c419dd66063597cc5d70e8919de60561':
  checkasm: v210: Fix array overwrite

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:28:19 +02:00
Hendrik Leppkes e8fbd80e14 Merge commit '4a664224502b42e3b28949d905a8de7769892184' 
* commit '4a664224502b42e3b28949d905a8de7769892184':
  pixfmt: Add new SMPTE color primaries and transfer characteristic values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:27:23 +02:00
Hendrik Leppkes 04eff96822 Merge commit '777885983533235ccda5145f96317fc8cd0a18ab' 
* commit '777885983533235ccda5145f96317fc8cd0a18ab':
  dcadec: set channel layout in a separate function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:21:07 +02:00
Hendrik Leppkes ecaa6cf7b8 Merge commit '971177f751a6e2931232accceab438bce277bde8' 
* commit '971177f751a6e2931232accceab438bce277bde8':
  dcadec: scan for extensions in a separate function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:08:22 +02:00
Hendrik Leppkes 157969321a Merge commit '22cc57da64bfd73f2206969486b0aa183ee76479' 
* commit '22cc57da64bfd73f2206969486b0aa183ee76479':
  rtpdec: Forward the memory failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-17 11:01:16 +02:00
Hendrik Leppkes 78af3ffaa9 Merge commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56' 
* commit '1ec611a10228945d2ec8a9cf6c5531dee6b7ee56':
  rtsp: warning when max_delay reached

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:11:24 +02:00
Hendrik Leppkes 85c85d453d Merge commit 'd555bd69e792e42d94bd909b30d9bfef01db4e25' 
* commit 'd555bd69e792e42d94bd909b30d9bfef01db4e25':
  rtpdec: inform jitter buffer size

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:11:06 +02:00
Hendrik Leppkes 3d481f39a2 Merge commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017' 
* commit 'ff7f6ea9db2a77d74f7e68a716f53ba1f3f85017':
  rtpdec: add a trace when jitter buffer is full

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:10:27 +02:00
Hendrik Leppkes 7cecab2f88 Merge commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb' 
* commit '3c525b8b4770c1ac5f466a12c5523802bd5d40eb':
  rtpdec: Increase the max size of the jitter buffer to 500 packets

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:07:05 +02:00
Hendrik Leppkes b2a72e8ab9 Merge commit '570fcaf3326aef9313b10863e2f6e6ae664d9dae' 
* commit '570fcaf3326aef9313b10863e2f6e6ae664d9dae':
  jpeg2000: Factor out prec init

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:04:46 +02:00
Hendrik Leppkes 2fc552b629 Merge commit '95a41311ac3a44773cc4dc407408aca35b1f8e26' 
* commit '95a41311ac3a44773cc4dc407408aca35b1f8e26':
  jpeg2000: Factor out band stepsize initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 14:01:58 +02:00
Hendrik Leppkes 054ce2d6ab Merge commit '7fb93eae43cc89bd7c1c275344e1cdbadab7155b' 
* commit '7fb93eae43cc89bd7c1c275344e1cdbadab7155b':
  jpeg2000: Factor out band initialization

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 13:58:30 +02:00
Hendrik Leppkes 8f80f3d074 Merge commit '1b709f23fb5f505c834d4c855703225795def01d' 
* commit '1b709f23fb5f505c834d4c855703225795def01d':
  jpeg2000: Refactor decode_packets

Not merged, as the ffmpeg code is much more advanced.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 13:57:50 +02:00
Hendrik Leppkes 64f72bb61f Merge commit '29b00f880faa404aa1d0d6820310c510c5996479' 
* commit '29b00f880faa404aa1d0d6820310c510c5996479':
  jpeg2000: Templatize the frame writer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 12:08:39 +02:00
Hendrik Leppkes 5a754f92d1 Merge commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e' 
* commit '41bcc3d15204f290400ba02e4e8f87fc07bcc00e':
  jpeg2000: Split codeblock decoding from the main tile decoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:31:40 +02:00
Hendrik Leppkes 5de28d341f Merge commit '6536da7371b4847a2824ed46b98829f127f24dad' 
* commit '6536da7371b4847a2824ed46b98829f127f24dad':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:31:11 +02:00
Hendrik Leppkes 52ce8b7b31 Merge commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b' 
* commit 'e60a6e7545dd6f5b25e3a65de9c6fdcc6e2e9d6b':
  mpegvideo: Drop mpegvideo.h where not needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:27:20 +02:00
Hendrik Leppkes 7b865c222e Merge commit '5d14cf199990cd378904a2618b5c72c4b02290f6' 
* commit '5d14cf199990cd378904a2618b5c72c4b02290f6':
  mpegvideo: Make sure mpegutils.h is included where needed

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:23:40 +02:00
Hendrik Leppkes b3ff8ef6ec Merge commit '525f58977c93e189fda49a5c4928feaf4d89fac6' 
* commit '525f58977c93e189fda49a5c4928feaf4d89fac6':
  mpegvideo: Move macros to more appropriate headers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:23:20 +02:00
Hendrik Leppkes 643a156002 Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d' 
* commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d':
  avfilter: Support both syntaxes for the scale filter

Not merged, ffmpeg has much more flexible option handling

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:20:42 +02:00
Hendrik Leppkes c2972a2800 Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b' 
* commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b':
  lavr: Remove unreachable code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:19:36 +02:00
Hendrik Leppkes 1eb2c0de9e Merge commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2' 
* commit 'dc54c78c4d56cdf5549f35ccff2fd66e7ffa0af2':
  buffersrc: Improve initialization log message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:19:17 +02:00
Hendrik Leppkes 03d47f2ff1 Merge commit '2c6014c629346ebfeb25fc715581a8df9175f71f' 
* commit '2c6014c629346ebfeb25fc715581a8df9175f71f':
  fate: Change global error option to private error_rate option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:18:28 +02:00
Hendrik Leppkes 25a7c2aed6 Merge commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e' 
* commit 'e17db9ac496420f8824190ff5059a8a3646cbb7e':
  fate: Move mv0 option from global to mpv private

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:14:37 +02:00
Hendrik Leppkes a600e7145f Merge commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac' 
* commit '5b142a4d334bfa8ee5ec5f364c26c98ddb425fac':
  lavc: Keep idct integer option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:12:32 +02:00
Hendrik Leppkes 352eb4b599 Merge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e' 
* commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e':
  avconv_filter: Use full named options

Not merged, as ffmpeg option syntax is quite different.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:12:07 +02:00
Hendrik Leppkes 182550e42c Merge commit '10de408738d28ab17aa5c1fdccd809b0637c12d5' 
* commit '10de408738d28ab17aa5c1fdccd809b0637c12d5':
  lavf: Update to the new crypto API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-16 11:06:55 +02:00
Hendrik Leppkes de969904b1 Merge commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa' 
* commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa':
  asfdec: add more checks for size left in asf packet buffer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 15:18:05 +02:00
Hendrik Leppkes 73e9f04ea5 Merge commit '1b2412f50185447da4212f65f06e8d72a6daf06e' 
* commit '1b2412f50185447da4212f65f06e8d72a6daf06e':
  lavc: Fix compilation with --disable-everything --enable-parser=mpeg4video

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 15:17:50 +02:00
Hendrik Leppkes 95f92b2513 Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b' 
* commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b':
  lavc: Sanitize header inclusion guards

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 15:16:57 +02:00
Hendrik Leppkes 580c4fc98a Merge commit '6064f697a321174232a3fad351afb21150c3e9e5' 
* commit '6064f697a321174232a3fad351afb21150c3e9e5':
  lavc: Enable side data only packets by default

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 15:12:05 +02:00
Hendrik Leppkes 33be39efe3 Merge commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c' 
* commit '1e0b8bf0b3b3b4247fb21e9839af342ae879607c':
  travis: fix dependencies

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:31:22 +02:00
Hendrik Leppkes e75b2e9c4b Merge commit '99404597201911de90cff2ef85f2d44176d39147' 
* commit '99404597201911de90cff2ef85f2d44176d39147':
  mmaldec: fix pkt_dts determination

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:30:41 +02:00
Hendrik Leppkes 264ff3dd2e Merge commit '87a051f97633010f71dfc1d23d806856499bf231' 
* commit '87a051f97633010f71dfc1d23d806856499bf231':
  lavc: allow asynchronous decoders to return correct pkt_dts values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:30:33 +02:00
Hendrik Leppkes 30fb54c23f Merge commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb' 
* commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb':
  mmaldec: disable timestamp interpolation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:29:29 +02:00
Hendrik Leppkes 45ae299785 Merge commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6' 
* commit '6b652c0273d79f2e0c52ad91450bd0737cf3c8a6':
  mmaldec: fix problems with flush logic

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:29:16 +02:00
Hendrik Leppkes 886f0f5ff1 Merge commit 'b84675d63aaede8f6944b901250a10456c5477e6' 
* commit 'b84675d63aaede8f6944b901250a10456c5477e6':
  mmaldec: hack against buffering problems on broken input

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:29:10 +02:00
Hendrik Leppkes 84d04a0dfa Merge commit '5788623d29c3e806a7879210986110aced758dc2' 
* commit '5788623d29c3e806a7879210986110aced758dc2':
  jpeg2000: Split codeblock decoding from the main tile decoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:25:38 +02:00
Hendrik Leppkes 6e611a1839 Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776' 
* commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776':
  jpeg2000: Do not warn about known and skippable markers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:16:13 +02:00
Hendrik Leppkes c074671621 Merge commit '9b5a4a9cce3042558e107ae1ed30d9bf3d867a35' 
* commit '9b5a4a9cce3042558e107ae1ed30d9bf3d867a35':
  mmvideo: Make sure the rle does not write over the frame boundaries

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:14:26 +02:00
Hendrik Leppkes 09c15eac3e Merge commit '41ed749fe987e60b0485fa721ad869590651324d' 
* commit '41ed749fe987e60b0485fa721ad869590651324d':
  ogg: Do not try to use the parser if it is not present

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:05:01 +02:00
Hendrik Leppkes eadf6cb2c4 Merge commit '7b02cb29d9d60cdd5ef321043d11d02023e7dc8f' 
* commit '7b02cb29d9d60cdd5ef321043d11d02023e7dc8f':
  pixdesc: Document the component order

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:03:04 +02:00
Hendrik Leppkes 6210a64822 Merge commit 'c7ed26ad6035793c7212c17545b0ded18b72db69' 
* commit 'c7ed26ad6035793c7212c17545b0ded18b72db69':
  pixdesc: Add missing alpha flag for yuva420p9be

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:00:31 +02:00
Hendrik Leppkes ba42096d9a Merge commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b' 
* commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b':
  pixdesc: Consistently order components

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 12:54:25 +02:00
Hendrik LeppkesandLuca Barbato c7ed26ad60 pixdesc: Add missing alpha flag for yuva420p9be 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-10 12:08:57 +02:00
Hendrik LeppkesandLuca Barbato e336c51e6f pixdesc: Consistently order components 
Ensure that the components are ordered consistently, ie. always
RGB(A) and YUV(A). This allows to identify a specific plane on a given
pixel format without hard-coding knowledge of the plane order.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-09-10 12:08:57 +02:00
Hendrik Leppkes b421455ee0 Merge commit '3b8e895237592fdaffe87cdcd204104200b9ccf9' 
* commit '3b8e895237592fdaffe87cdcd204104200b9ccf9':
  codec_desc: Add missing DXV entry

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-09 09:55:14 +02:00
Hendrik Leppkes 5d8e836d0e Replace all remaining occurances of step/depth_minus1 and offset_plus1 2015-09-08 17:10:48 +02:00
Hendrik Leppkes 151aa2ebff Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba' 
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
  lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 16:35:28 +02:00
Hendrik Leppkes f53569a93f Merge commit '6b3ef7f080293956b2e5212b83135c6b051212e9' 
* commit '6b3ef7f080293956b2e5212b83135c6b051212e9':
  lavu: Remove bit packing from AVComponentDescriptor

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:53:34 +02:00
Hendrik Leppkes c734b34b04 Merge commit 'b8b5d8274471129f122858bc74ad09284dae6ab7' 
* commit 'b8b5d8274471129f122858bc74ad09284dae6ab7':
  lavu: extend size of the AVPixFmtDescriptor.flags field

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:53:13 +02:00
Hendrik Leppkes 8998caf0a4 Merge commit '77cf23668991bfd1fb69339f13e1511b4186b7b3' 
* commit '77cf23668991bfd1fb69339f13e1511b4186b7b3':
  asfdec: alloc enough space for storing name in asf_read_metadata_obj

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:46:21 +02:00
Hendrik Leppkes f4ce8cea73 Merge commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4' 
* commit '7cad1bf0759ada2a1fc3e80bb232a5377dd4fda4':
  mov: Allow more than one keyframe per trun

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:46:02 +02:00
Hendrik Leppkes 72773203a6 Merge commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946' 
* commit 'd0f7e4a57fbffa0efb204d4274c3dd56fbfff946':
  dxtory: Unify and rework the decoding routines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:34:09 +02:00
Hendrik Leppkes 8537e24927 Merge commit '3cdda78deb19b39dbbf8961ae0aec44dbb19bf6d' 
* commit '3cdda78deb19b39dbbf8961ae0aec44dbb19bf6d':
  checkasm: add unit tests for v210enc

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:30:00 +02:00
Hendrik Leppkes 80b93f2463 Merge commit '599fe93a840397f551d94db406d0bad42b46b94b' 
* commit '599fe93a840397f551d94db406d0bad42b46b94b':
  riff: Add AVj2 fourcc for Avid jpeg2000

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:28:39 +02:00
Hendrik Leppkes aa15e233c4 Merge commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be' 
* commit 'a7e6fbd90e62d3320b1e26d8209fc0f55ee5b0be':
  dxtory: Factorize the buffer loading

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:27:05 +02:00
Hendrik Leppkes 696634c5fa Merge commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac' 
* commit '6a6bc43f5f79587b8936334cc0b3a6616f4807ac':
  dxtory: Factorize slice size checks

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:23:53 +02:00
Hendrik Leppkes 94d7060d71 Merge commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25' 
* commit 'db9fd1e9af83e88bcf2ef40db6a5debf91845c25':
  fraps: increase vlc nb_bits

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:19:17 +02:00
Hendrik Leppkes ec6b4e21bd Merge commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b' 
* commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b':
  huffman: allow specifying nb_bits to ff_huff_build_tree()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:17:59 +02:00
Hendrik Leppkes b7ce3aefec Merge commit '26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda' 
* commit '26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda':
  huffman: increase bits constant

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:17:04 +02:00
Hendrik Leppkes 140318c396 Merge commit '5a19bce2ff2b61602889392bec747ce81d1e9a1b' 
* commit '5a19bce2ff2b61602889392bec747ce81d1e9a1b':
  huffman: use a named identifer for the bits constant

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-08 14:16:36 +02:00
Hendrik Leppkes 1f1c100833 Merge commit '9ad1e0c12caa440de860bd8f2122beb11d73815c' 
* commit '9ad1e0c12caa440de860bd8f2122beb11d73815c':
  mux: Make sure that the data is actually written

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:19:40 +02:00
Hendrik Leppkes 88e7ea3e56 Merge commit 'e05f7ed5436207f4a55f1978b223c7f8bc82af42' 
* commit 'e05f7ed5436207f4a55f1978b223c7f8bc82af42':
  file: properly forward errors from file_read() and file_write()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:11:57 +02:00
Hendrik Leppkes 1789e46d34 Merge commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17' 
* commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17':
  mpegvideo: Drop a stray error message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:08:42 +02:00
Hendrik Leppkes d02d208211 Merge commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b' 
* commit 'c45fcf30cfab687004ed1cdc06ebaa21f4262a0b':
  DXV decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 16:07:07 +02:00
Hendrik Leppkes 1964aeae42 Merge commit '0c7707610f46a28b65eff935500c78c9781f8f4f' 
* commit '0c7707610f46a28b65eff935500c78c9781f8f4f':
  lavc: Add a lzf decompressor

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:53:00 +02:00
Hendrik Leppkes d4f63be92b Merge commit '4dc9f00365853b1239936d771856cf1881b5c5ce' 
* commit '4dc9f00365853b1239936d771856cf1881b5c5ce':
  build: Skip libvpx.h if libvpx is not enabled

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:31:14 +02:00
Hendrik Leppkes a92bd1901f Merge commit '1a164e0a83dd7c1b129aeef10cb3caff368ce850' 
* commit '1a164e0a83dd7c1b129aeef10cb3caff368ce850':
  tools: Drop a stale header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:29:33 +02:00