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,066 Commits 39 Branches 425 Tags
8998caf0a4d7e55f040c419f984be885ca0688db
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hendrik Leppkes c8c9940f47 Merge commit '87a11db220dec523e39eb4af715175e150787a72' 
* commit '87a11db220dec523e39eb4af715175e150787a72':
  dnxhddata: Double frame_size for cid 1260

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:29:25 +02:00
Hendrik Leppkes b7601b5f3d Merge commit 'a686e58165ca0f83966431a9166cb6e17bf6095c' 
* commit 'a686e58165ca0f83966431a9166cb6e17bf6095c':
  des: Add missing include

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:28:25 +02:00
Hendrik Leppkes 84cca0644a Merge commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78' 
* commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78':
  ismindex: Use the correct abs() version

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:27:21 +02:00
Hendrik Leppkes b8346b2294 Merge commit '9a003fc38833b6b9f08e44d7f1c6539db65840a0' 
* commit '9a003fc38833b6b9f08e44d7f1c6539db65840a0':
  lavr: Remove unused label

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:26:13 +02:00
Hendrik Leppkes 464dc6e09f Merge commit 'b0d94324d21d0c1c4adf1c8c329928afe473b099' 
* commit 'b0d94324d21d0c1c4adf1c8c329928afe473b099':
  libfdk-aacdec: Remove unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:25:13 +02:00
Hendrik Leppkes 7e272100c9 Merge commit '6bcd3e05998b41fb3b2c8dcc79e4662854e5208d' 
* commit '6bcd3e05998b41fb3b2c8dcc79e4662854e5208d':
  build: Add support for travis CI

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-07 12:24:51 +02:00
Hendrik Leppkes 34e85cb340 avcodec/vorbis: remove avpriv vorbis parser cruft 
It was replaced by a public API
 2015-09-06 16:25:58 +02:00
Hendrik Leppkes 2cad7eebc1 avcodec/flac: remove avpriv parsing API cruft 2015-09-06 16:25:56 +02:00
Hendrik Leppkes eb011f73ca avcodec/alac: remove dead code cruft 
The output is always planar since two major bumps, remove all code
related to packed output.
 2015-09-06 16:25:55 +02:00
Hendrik Leppkes 8042d6c492 avcodec: remove old_codec_ids.h from SKIPHEADERS as well 2015-09-05 21:55:59 +02:00
Hendrik Leppkes 393b472362 avcodec: fix make install after old_codec_ids.h removal 2015-09-05 21:54:53 +02:00
Hendrik Leppkes 160e92c8bf Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249' 
* commit 'e88103a7f92cf27a2868b50acc8a9912f6088249':
  Bump major versions of all libraries

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 21:35:46 +02:00
Hendrik Leppkes 590ea32e54 Postpone removal of API changes from within the last two years 2015-09-05 21:21:20 +02:00
Hendrik Leppkes 24e3bac52a avcodec: remove deprecated codec id aliases 2015-09-05 21:15:58 +02:00
Hendrik Leppkes 76cac7ed45 avcodec: remove deprecated old video encode API 2015-09-05 21:15:57 +02:00
Hendrik Leppkes 64c33f9624 avcodec: remove deprecated old audio encode API 2015-09-05 21:15:55 +02:00
Hendrik Leppkes 2c8ee2547e avcodec: remove deprecated old audio decode API 2015-09-05 21:15:54 +02:00
Hendrik Leppkes d83dd630a0 lavu: Drop FF_API_GET_CHANNEL_LAYOUT_COMPAT cruft 
FATE refs changed to accomodate for the new default behavior of the function.
Numbers are now interpreted as a channel layout, instead of a number of channels.
 2015-09-05 20:36:19 +02:00
Hendrik Leppkes 3433228795 lavfi: remove old graph parser API with different semantics 
This API hasn't been active since the last bump already.
 2015-09-05 18:35:09 +02:00
Hendrik Leppkes 237cf3786e lavu: Drop old deprecated AVOption API 
Deprecated in 2011/10
 2015-09-05 18:30:35 +02:00
Hendrik Leppkes 137f075993 lavu/hmac: remove deprecated type ids 2015-09-05 18:07:20 +02:00
Hendrik Leppkes 545559e43d Remove FF_CONST_AVUTIL55 cruft 2015-09-05 17:56:28 +02:00
Hendrik Leppkes 2df52088ef Merge commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a' 
* commit '4e649debcf7f71d35c6b38cdb7ee715eba95d64a':
  Postpone API-incompatible changes until the next bump

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:52:10 +02:00
Hendrik Leppkes 6f6c025d6d Merge commit '3d89373fae281053154772d5e3e4370da09d3880' 
* commit '3d89373fae281053154772d5e3e4370da09d3880':
  lavu: Drop deprecated private lls functions

Previously removed in ffmpeg

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:46:47 +02:00
Hendrik Leppkes f940931995 Merge commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e' 
* commit '2f9b652e8c646eabef74a6742f0d7d4c9118fd0e':
  lavu: Drop deprecated context size variables

These variables had been previously un-deprecated in ffmpeg, not removed.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:44:55 +02:00
Hendrik Leppkes a991526832 lavu/frame: put frame QP elements under a new version guard 
These fields are still used, removal postponed until a replacement functionality is available.
 2015-09-05 17:35:31 +02:00
Hendrik Leppkes b9fd813351 Merge commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79' 
* commit '8f12ef9860d0e164e4647fd5d5cebdb3cfb34a79':
  lavu: Drop deprecated duplicated AVFrame/AVCodecContext parameters

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:31:45 +02:00
Hendrik Leppkes f1b02e6ca8 lavu/cpu: remove old cmov cruft 2015-09-05 17:23:28 +02:00
Hendrik Leppkes 58ebb39127 Merge commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be' 
* commit 'bf7114b6caad8cf94696b0299c13b0d26bf291be':
  lavu: Drop deprecated AV_CPU_FLAG_MMX2 symbol

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:19:50 +02:00
Hendrik Leppkes d9218011ef Merge commit '2d40968dd3ff17b12f7c80dbfad409b14418e267' 
* commit '2d40968dd3ff17b12f7c80dbfad409b14418e267':
  lavu: Drop deprecated audioconvert.h header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:18:05 +02:00
Hendrik Leppkes d96d0252fd Merge commit 'cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a' 
* commit 'cdfe45ad371b7a8e6135b6c063b6b2a93152cb3a':
  lavu: Drop deprecated av_reverse function

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:17:15 +02:00
Hendrik Leppkes 0eed703d64 Merge commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51' 
* commit '2f8cbbc962dfc0dc1dd0a90b2cd6c21266380f51':
  lavu: Drop deprecated external access to AVPixFmtDescriptor table

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:12:23 +02:00
Hendrik Leppkes c10caea214 Merge commit '183db02a51a422568084b113a7571c845ca68622' 
* commit '183db02a51a422568084b113a7571c845ca68622':
  lavu: Drop deprecated old_pix_fmt.h and related code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:10:28 +02:00
Hendrik Leppkes 41194f065c Merge commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798' 
* commit 'cad40a3833ad81a352e7657ec6f7d637cea3b798':
  lavc: Drop deprecated deinterlace module

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:06:14 +02:00
Hendrik Leppkes 7f6b794da0 Merge commit '069713aa4b137781e270768d803b1f7456daa724' 
* commit '069713aa4b137781e270768d803b1f7456daa724':
  lavc: Drop deprecated thread opaque and codec pkt

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 17:03:44 +02:00
Hendrik Leppkes 4eb86b83a4 Merge commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a' 
* commit '9f90b24877016e7140b9b14e4b1acee663bb6d8a':
  lavc: Drop deprecated get_buffer related functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 16:59:23 +02:00
Hendrik Leppkes 83a5df54ea Remove left-over FF_API_DESTRUCT_PACKET cruft 2015-09-05 16:51:53 +02:00
Hendrik Leppkes 87c8812270 Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8' 
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
  lavc: Drop deprecated destruct_packet related functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 16:50:09 +02:00
Hendrik Leppkes b27ddffbfb Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c' 
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c':
  lavc: Drop deprecated request_channels related functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 16:42:44 +02:00
Hendrik Leppkes 144fb06806 Remove left-over FF_API_AVFILTERBUFFER cruft 2015-09-05 16:27:19 +02:00
Hendrik Leppkes 033764e015 Merge commit 'f6974fe651d29ef6eb68d66d73f7b6c011062aa0' 
* commit 'f6974fe651d29ef6eb68d66d73f7b6c011062aa0':
  lavfi: Drop deprecated AVFilterBuffer* code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 16:22:03 +02:00
Hendrik Leppkes 43e2e172df Merge commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1' 
* commit 'e65e4cbbda03ca3c9087f069c9867d518415fca1':
  lavfi: Drop deprecated *_count suffixed variables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 16:11:22 +02:00
Hendrik Leppkes 2751d5f0ba Merge commit '86e5056575f55f070609dd3926605302f7d2280e' 
* commit '86e5056575f55f070609dd3926605302f7d2280e':
  lavfi: Drop deprecated public AVFilterPad struct

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 16:01:24 +02:00
Hendrik Leppkes e2adb00ec5 Merge commit '11b2eed43e91b35b8295ed47115cae2e29bd687d' 
* commit '11b2eed43e91b35b8295ed47115cae2e29bd687d':
  lavr: Drop deprecated context reinitialization if resampling was not enabled

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 15:59:40 +02:00
Hendrik Leppkes cebe51a625 Merge commit '9d58639e270f7612874681e0ca30fa461e2667b7' 
* commit '9d58639e270f7612874681e0ca30fa461e2667b7':
  sws: Drop deprecated SWS_CPU_CAPS defines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-05 15:58:52 +02:00
Hendrik Leppkes d5911e6963 Merge commit 'c457bdebe7af643b380aa0f6add3cb4335d218dc' 
* commit 'c457bdebe7af643b380aa0f6add3cb4335d218dc':
  checkasm: Fix floating point arguments on 64-bit Windows

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-31 10:08:18 +02:00
Hendrik Leppkes ea1061e147 Merge commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6' 
* commit 'b1abd2aaf91be249f24cb74db9c205d9e4ca9da6':
  vf_scale: Add an option to pass the scaler params

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-31 10:07:34 +02:00
Hendrik Leppkes 80a12be10f Merge commit 'c23999be134bde0a0554261a9043be7dbc01de0c' 
* commit 'c23999be134bde0a0554261a9043be7dbc01de0c':
  avconv_opt: Add an option that lists all supported hwaccels

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-31 10:01:58 +02:00
Hendrik Leppkes ad79fa471b Merge commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3' 
* commit '629d4c5b4deee08bf3a4f3ab45fd4f8b76d7aff3':
  avconv_opt: Add missing comma

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-31 10:00:07 +02:00
Hendrik Leppkes f5258a7d16 Merge commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04' 
* commit 'e176639bcbf4b580edb462a6b0650e53cd5e3c04':
  webm: Explicitly select libvpx, libopus and libvorbis encoders

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:53:07 +02:00
Hendrik Leppkes ebff705c2c Merge commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421' 
* commit '413d4e54a9bffe2d0afdc6d8a80f516e5df6a421':
  nvenc: Properly free the fifos

Not merged, ffmpeg's nvenc doesn't use these fifos.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:50:53 +02:00
Hendrik Leppkes 540f280098 Merge commit '2157df425bd909854fd4afcec4aa3311d8a3b31b' 
* commit '2157df425bd909854fd4afcec4aa3311d8a3b31b':
  hlsenc: Support outputting specific versions

Not merged, the version is auto-selected in ffmpeg based on enabled features.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:49:21 +02:00
Hendrik Leppkes 427598a2f4 Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083' 
* commit 'd68705c9756e6558c8e28d90b4c364f25ba72083':
  dnxhddata: Add tables for missing DNx100 profiles

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:40:06 +02:00
Hendrik Leppkes f30132f9c4 Merge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8' 
* commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8':
  dnxhddata: Merge a few duplicated RUN tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:31:52 +02:00
Hendrik Leppkes f19a283867 Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc' 
* commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc':
  dnxhddata: Group together RUN-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:29:54 +02:00
Hendrik Leppkes 305f461754 Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1' 
* commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1':
  dnxhddata: Merge a few duplicated DC tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:27:02 +02:00
Hendrik Leppkes 3b0af76c1b Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec' 
* commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec':
  dnxhddata: Group together DC-related tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:26:14 +02:00
Hendrik Leppkes 3f491224fe Merge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f' 
* commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f':
  dnxhddata: List the reused tables in a comment

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:19:41 +02:00
Hendrik Leppkes bd074bde02 Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b' 
* commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b':
  dnxhddata: Keep a single CID in the table names

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-27 09:17:37 +02:00
Hendrik Leppkes fd2977d85f Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f' 
* commit 'e23f84d9652474353d8bbc42787a56ec1991908f':
  channel_layout: Add a 16channel default layout

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:40:24 +02:00
Hendrik Leppkes d2d6ca6f98 Merge commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e' 
* commit 'd5eab59a5373b22aa52d6053a8e853e95a6e131e':
  aac: Make sure to set err on the failure path

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:39:08 +02:00
Hendrik Leppkes 87ee98c898 Merge commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd' 
* commit '167ea1fbf15ecefa30729f9b8d091ed431bf43bd':
  xavs: Do not try to set the bitrate tolerance without a bitrate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:37:50 +02:00
Hendrik Leppkes 0f72dfeb5f Merge commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc' 
* commit '61d8fa2a1ab76f0f3ac1442faa104ace4b29decc':
  h264: Fix faulty call to avpriv_request_sample

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:36:27 +02:00
Hendrik Leppkes a4c13f95fb Merge commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068' 
* commit 'f9ab4fe1f7c1e9d410ca5ee2c9ff8d2892aad068':
  h264: Discard currently unsupported registered sei

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:36:07 +02:00
Hendrik Leppkes 59cae1916e Merge commit '47b447aaff1bc30ba986ca757346a2c5c95b786a' 
* commit '47b447aaff1bc30ba986ca757346a2c5c95b786a':
  imgutils: Fix a typo in avcodec_get_pix_fmt_loss

Not merged, this code was refactored and moved to avutil.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:34:38 +02:00
Hendrik Leppkes 0cbae3763d Merge commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828' 
* commit 'd8ebb6157d12183ed3fc987cd2ba18b404758828':
  hevcdsp: fix a function name

Not merged, ffmpeg has no function of this name anymore.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:32:34 +02:00
Hendrik Leppkes 001ea567ff Merge commit 'a1926a29fb4325afa46842883f197c74d4535c36' 
* commit 'a1926a29fb4325afa46842883f197c74d4535c36':
  hevc: avoid invalid shifts of negative values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:29:26 +02:00
Hendrik Leppkes fea156367d Merge commit '515b69f8f8e9a24cfaee95d8c1f63f265d8582fe' 
* commit '515b69f8f8e9a24cfaee95d8c1f63f265d8582fe':
  checkasm: Explicitly declare function prototypes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:27:39 +02:00
Hendrik Leppkes 38b42250dc Merge commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5' 
* commit 'e13da244f41610ee073b2f72bcf62b60fa402bb5':
  checkasm: x86: properly save rdx/edx in checked_call()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:26:29 +02:00
Hendrik Leppkes 11014dd3d4 Merge commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae' 
* commit 'faa3f17a76333b672ce4a40cf80f678ab68bdbae':
  fate: test only demuxing in asf-repldata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-24 10:25:41 +02:00
Hendrik Leppkes 649b2e4c83 Merge commit '317cfaa5e09755ed0b34af512ec687963a67bdbf' 
* commit '317cfaa5e09755ed0b34af512ec687963a67bdbf':
  asfdec: prevent the memory leak in the asf_read_metada_obj

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:35:56 +02:00
Hendrik Leppkes 4b6ccccb03 Merge commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33' 
* commit '58c3720a3cc71142b5d48d8ccdc9213f9a66cd33':
  fate: Make sure a corner-case for ASF is covered

Adjusted fate ref to match the different timebase of the ffasf demuxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:34:53 +02:00
Hendrik Leppkes 316825f3e9 Merge commit '72839fce6457fdb5d51b4a5381ac52914ee66389' 
* commit '72839fce6457fdb5d51b4a5381ac52914ee66389':
  hlsenc: Use AV_TIME_BASE units for all the computations

Not merged, duration/time computation is handled quite differently in ffmpeg's hlsenc

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:22:41 +02:00
Hendrik Leppkes 983fa5a1a9 Merge commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b' 
* commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b':
  vp7: bound checking in vp7_decode_frame_header

Only partially merged, see 46f72ea507

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:14:08 +02:00
Hendrik Leppkes e721cb8d8b Merge commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1' 
* commit 'f34b152eb7b7e8d2aee57c710a072cf74173fbe1':
  libfdk-aacdec: Clean up properly if the init fails

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:09:55 +02:00
Hendrik Leppkes 4cf4831ae7 Merge commit '1b90433f79de857550d4d8c35c89fbe954920594' 
* commit '1b90433f79de857550d4d8c35c89fbe954920594':
  libfdk-aacdec: Always decode into an intermediate buffer

Conflicts:
	libavcodec/libfdk-aacdec.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:05:54 +02:00
Hendrik Leppkes 9dc30d0811 Merge commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855' 
* commit '87de6ddb7b7674e329d5c96677bd8685bc7f7855':
  libfdk-aacdec: Bump the max number of channels to 8

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:02:15 +02:00
Hendrik Leppkes fdca935013 Merge commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3' 
* commit 'cb2dbe2c762dae44d890aa26620bcdd9022fd0f3':
  configure: arm: Assume softfp ABI on darwin

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:02:01 +02:00
Hendrik Leppkes 9c22aedd26 Merge commit '44b44441203177690305c294be6eff8d9c668954' 
* commit '44b44441203177690305c294be6eff8d9c668954':
  x86inc: Various minor backports from x264

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 09:01:35 +02:00
Hendrik Leppkes 1907e19d0c Merge commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33' 
* commit '26ac22e5e7394346e9d59f800e7d4e91f4518d33':
  movenc: Add a new flag for writing global sidx indexes for dash

Conflicts:
	libavformat/movenc.c
	libavformat/movenc.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-18 08:50:22 +02:00
Hendrik Leppkes 8a8aee358d Merge commit 'ab43beefab9147673e09679e04be08431684a5db' 
* commit 'ab43beefab9147673e09679e04be08431684a5db':
  x86inc: Drop SECTION_TEXT macro

See f0b7882ceb

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-12 12:40:45 +02:00
Hendrik Leppkes f0da598069 Merge commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e' 
* commit '1c6bb813284732d9a1acacfe99522d9f66ebf73e':
  x86inc: Disable vpbroadcastq workaround in newer yasm versions

See f151fbd9e5

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-12 12:37:44 +02:00