virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
85,336 Commits 37 Branches 400 Tags 465 MiB
3f8d7342c3
Commit Graph

6452 Commits

Author SHA1 Message Date
James Almer
3f8d7342c3 doc/libav-merge: remove line about extract_extradata_bsf usage 
It was addressed in b8f26779d6
 2017-04-07 17:31:40 -03:00
Steve Lhomme
157e57a181 lavc: Add Content Light Level side metadata found in HEVC 
These data are necessary when transmitting HDR over HDMI.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-04-06 11:38:15 -03:00
Steve Lhomme
b378f5bd64 lavu: add support for Content Light Level side metadata 
As found in HEVC.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-04-06 11:26:25 -03:00
Clément Bœsch
d8eb40bd70 doc/general: fix project name after 2b1a6b1ae 2017-04-05 18:38:52 +02:00
James Almer
22164971b0 Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7' 
* commit '286ab878bd39b56008035638227b3ecb8ec5bbb7':
  fate.sh: Allow setting other make flags for running tests

Merged-by: James Almer <jamrial@gmail.com>
 2017-04-04 15:03:34 -03:00
James Almer
81cc33adc6 Merge commit 'c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65' 
* commit 'c7ab0eb3050acdd3b8cab2c55fc9c1b2e8610a65':
  examples/decode_video: allocate the packet dynamically

Merged-by: James Almer <jamrial@gmail.com>
 2017-04-04 14:47:09 -03:00
James Almer
52bce9a13d Merge commit '728ea23cce07467b732f538c87c13da13dd6dcf3' 
* commit '728ea23cce07467b732f538c87c13da13dd6dcf3':
  examples/decode_video: switch to the new decoding API

Merged-by: James Almer <jamrial@gmail.com>
 2017-04-04 14:41:23 -03:00
James Almer
fddd6af45c Merge commit 'f78d360bba6dcfb585847a49a84e89c25950fbdb' 
* commit 'f78d360bba6dcfb585847a49a84e89c25950fbdb':
  examples/decode_video: use a parser for splitting the input

Merged-by: James Almer <jamrial@gmail.com>
 2017-04-04 14:37:27 -03:00
Matthieu Bouron
400378b7b3 doc/examples/extract_mvs: re-indent after previous commit 2017-04-04 14:10:22 +02:00
Matthieu Bouron
1cf93196fc doc/examples/extract_mvs: make pkt local to the main function 2017-04-04 14:10:22 +02:00
Matthieu Bouron
82116bd8a4 doc/examples/extract_mvs: switch to new decoding API 2017-04-04 14:10:22 +02:00
Clément Bœsch
6db36a0227 Merge commit '59ab9e8ba1df7e3347a4cd2bd56c32e74aede802' 
* commit '59ab9e8ba1df7e3347a4cd2bd56c32e74aede802':
  examples/encode_video: allocate the packet dynamically

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:48:23 +02:00
Clément Bœsch
4ea942f2ce Merge commit '5f102a9559099429826e84758b8b5182244c52db' 
* commit '5f102a9559099429826e84758b8b5182244c52db':
  examples/encode_video: switch to the new encoding API

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:44:45 +02:00
Clément Bœsch
dd0113da3c Merge commit 'fee0f1de2c6a9924acb74013436dbea8f2bd1ecb' 
* commit 'fee0f1de2c6a9924acb74013436dbea8f2bd1ecb':
  examples/decode_audio: flush the decoder

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:40:34 +02:00
Clément Bœsch
d1105e8f43 Merge commit '9a38184a143a1560814b084aebe628f8df46e666' 
* commit '9a38184a143a1560814b084aebe628f8df46e666':
  examples/decode_audio: allocate the packet dynamically

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:38:56 +02:00
Clément Bœsch
3d12d10677 Merge commit '3d66717f7cb5555257244be8f5bce172ed3af7ac' 
* commit '3d66717f7cb5555257244be8f5bce172ed3af7ac':
  examples/decode_audio: use the new audio decoding API

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:33:04 +02:00
Clément Bœsch
87e16e2b44 Merge commit '0946c754d99c05413e813ee515039adcf0f9232a' 
* commit '0946c754d99c05413e813ee515039adcf0f9232a':
  examples/decode_audio: use a parser for splitting the input

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-04-04 11:27:37 +02:00
Clément Bœsch
34ec327f69 examples/decode_audio: reduce the scope of 2 variables 2017-04-04 11:17:35 +02:00
Nicolas George
0c20f9fcab doc/muxers: fix default value for image2 option start_number. 2017-04-04 09:15:01 +02:00
Paul B Mahol
7e59393d40 avfilter/vf_pad: add aspect option 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-04-03 22:35:34 +02:00
Clément Bœsch
a434657de9 Merge commit 'f27e262dbdea1991b22e08b639ac03e642a3482c' 
* commit 'f27e262dbdea1991b22e08b639ac03e642a3482c':
  examples/encode_audio: switch to the new audio encoding API

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 21:14:16 +02:00
Clément Bœsch
54e195cf52 Merge commit '44c9f374f188f92927b7a4aad2101289d446b814' 
* commit '44c9f374f188f92927b7a4aad2101289d446b814':
  examples/qsvdec: convert to the new decoding API

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 21:10:07 +02:00
Clément Bœsch
4069394fd4 Merge commit '1dd2b6c91ca5f26207805720d4f5564de60b241b' 
* commit '1dd2b6c91ca5f26207805720d4f5564de60b241b':
  examples/qsvdec: switch to the hwcontext API

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 21:07:59 +02:00
Clément Bœsch
3d34d5c1cf Merge commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d' 
* commit 'bdbb8c68668b7610f5a310f5bbb246d2b950426d':
  doc: Add libxavs section

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 20:50:03 +02:00
Clément Bœsch
ee161dac9d Merge commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9' 
* commit '0b5a26e8bcd219efe5da3a6d39b588fabf91f2b9': (35 commits)
  qdm2: Convert to the new bitstream reader
  qcelp: Convert to the new bitstream reader
  pcx: Convert to the new bitstream reader
  opus: Convert to the new bitstream reader
  nellymoser: Convert to the new bitstream reader
  jvdec: Convert to the new bitstream reader
  hqx: Convert to the new bitstream header
  hq_hqa: Convert to the new bitstream reader
  gsm: Convert to the new bitstream reader
  g72x: Convert to the new bitstream reader
  g2meet: Convert to the new bitstream reader
  fraps: Convert to the new bitstream reader
  flashsv: Convert to the new bitstream reader
  faxcompr: Convert to the new bitstream reader
  exr: Convert to the new bitstream reader
  escape130: Convert to the new bitstream reader
  escape124: Convert to the new bitstream reader
  dvdsubdec: Convert to the new bitstream reader
  dss_sp: Convert to the new bitstream reader
  cook: Convert to the new bitstream reader
  ...

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-03 20:38:28 +02:00
Clément Bœsch
a3fc5f535a doc/libav-merge: document hlsenc encryption state 2017-04-01 18:21:34 +02:00
Clément Bœsch
e181e2909b doc/examples/transcode_aac: replace local get_error_text with av_err2str 2017-04-01 12:45:33 +02:00
Clément Bœsch
2b1a6b1ae3 Merge commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f' 
* commit 'bf8646274b3ea2d9a193edfdbd70a3bb5c6dd74f':
  doc: Add note about recent regression in AviSynth+

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-01 12:41:42 +02:00
James Almer
6171f178e7 x86/hevc_add_res: merge last remaining changes from 3d65359832 
See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html
 2017-03-31 20:49:45 -03:00
James Almer
b62a87591e doc/libav-merge: link to the relevant ml thread in the extract_extradata line 2017-03-31 20:35:16 -03:00
James Almer
b27dd80255 doc/decode_audio: use <> to include libav* headers 
Found-by: ubitux
 2017-03-31 16:50:51 -03:00
James Almer
ebe9808aaa Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b' 
* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-31 15:46:13 -03:00
James Almer
183635b9e9 doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska 2017-03-31 15:33:48 -03:00
James Almer
9033e8723c avutil/spherical: add av_spherical_projection_name() 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-31 13:26:56 -03:00
James Almer
0505a1d9c4 doc/libav-merge: remove line about AC3 fixed decoder speedup 
It was addressed in commit 91ccd38c0b
 2017-03-31 11:31:41 -03:00
Michael Niedermayer
1317a9f7aa doc/APIchanges: Update 2017-03-31 13:21:06 +02:00
Michael Niedermayer
59b8c2a4e6 doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum sample rate 
This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 16:34:06 +02:00
Matthieu Bouron
03372d0a90 doc/examples/filtering_audio: switch to new decoding API 2017-03-30 16:20:13 +02:00
Matthieu Bouron
afd257b43f doc/examples/filtering_video: switch to new decoding API 2017-03-30 16:20:07 +02:00
Clément Bœsch
b22c4d822b doc/codecs: add jedec-p22 2017-03-30 13:59:15 +02:00
Clément Bœsch
4cda23f1f1 Merge commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0' 
* commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0':
  hwcontext: Hardware frame mapping

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:36:37 +02:00
Clément Bœsch
a1b3ded902 Merge commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484' 
* commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484':
  doc: Turn off noisy deprecation warnings in the option printer

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 15:20:10 +02:00
Clément Bœsch
549045254c Fix all -Wformat warnings raised by DJGPP 2017-03-29 14:49:29 +02:00
Clément Bœsch
bfdcdd6d82 lavu: add av_fourcc_make_string() and av_fourcc2str() 2017-03-29 14:49:29 +02:00
Clément Bœsch
fdbc29ca70 Merge commit '8191f960a669819db4de33a2439ded1630b8a73e' 
* commit '8191f960a669819db4de33a2439ded1630b8a73e':
  examples/decode_video: constify the AVCodec instance

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:22:32 +02:00
Clément Bœsch
58f24adc05 Merge commit '5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c' 
* commit '5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c':
  examples/encode_video: use the AVFrame API for allocating the frame

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:21:52 +02:00
Clément Bœsch
944e5ce3ec doc/examples/{de,en}code_audio: fix includes 
Consistent with other examples.
 2017-03-29 14:18:10 +02:00
Clément Bœsch
4726bbb471 Merge commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83' 
* commit 'd0a603a534a0ee4b255e5e72742428a7f7f42b83':
  examples/encode_video: set the framerate

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:16:33 +02:00
Clément Bœsch
e9bd457465 Merge commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4' 
* commit 'e02524025bce2c8bf8b5bffd96479785c75a70d4':
  examples/encode_video: constify the AVCodec instance

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:15:01 +02:00
Clément Bœsch
925ce244d8 Merge commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d' 
* commit '7b1f03477f1a43d2261fbd83e50a4ad90c7f806d':
  examples/avcodec: split the remaining two examples into separate files

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 14:09:09 +02:00