ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,849 Commits 36 Branches 398 Tags 535 MiB
1a577c59d0
Commit Graph

6428 Commits

Author SHA1 Message Date
Michael Niedermayer
6fe9f36dd9 Update for FFmpeg 3.3.9 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-11-01 01:32:12 +01:00
Michael Bunk
7266a6d23c examples: Fix use of AV_CODEC_FLAG_GLOBAL_HEADER 
AV_CODEC_FLAG_GLOBAL_HEADER should be set before calling avcodec_open2() to have any effect.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a82e4fb8c6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-11-01 00:52:46 +01:00
Michael Niedermayer
18c9d5d3e8 update for 3.3.8 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-07-16 20:44:22 +02:00
Michael Niedermayer
f4e2ac296d doc/APIchanges: Fix typos in hashes 
Thanks-to: Moritz Barsnick <barsnick@gmx.net> for finding the correct ones

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ec8a5262b0)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-07-16 19:06:26 +02:00
Michael Niedermayer
7af6fba145 Update for 3.3.7 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2018-04-13 01:54:06 +02:00
Michael Niedermayer
54897d7466 Update for 3.3.6 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-12-30 21:13:19 +01:00
Michael Niedermayer
60b385a5bf Update for 3.3.5 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-26 17:36:17 +02:00
Michael Niedermayer
eca53fd52b Update for 3.3.4 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-11 14:54:47 +02:00
Michael Niedermayer
305f37e5be avformat/hls: Fix DoS due to infinite loop 
Fixes: loop.m3u

The default max iteration count of 1000 is arbitrary and ideas for a better solution are welcome

Found-by: Xiaohei and Wangchu from Alibaba Security Team

Previous version reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7ec414892d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-09-10 01:33:28 +02:00
Brice Waegeneire
4627033a23 doc/filters: typo in frei0r 
Signed-off-by: Brice Waegeneire <brice.wge@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6a6eec485d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-07-23 15:01:03 +02:00
Michael Niedermayer
ab81ea1035 Update for 3.3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-07-19 15:28:08 +02:00
Michael Niedermayer
6d7192bcb7 Update for 3.3.2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-06-06 22:11:21 +02:00
Kevin Mark
573e40e8f1 doc/filters: Clarify scale2ref example 
Signed-off-by: Kevin Mark <kmark937@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 114e871621)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-06-02 01:14:38 +02:00
Clément Bœsch
ff1f181178 doc/general: fix project name after 2b1a6b1ae 
(cherry picked from commit d8eb40bd70)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-14 18:22:05 +02:00
Michael Niedermayer
8fbd347508 Update for 3.3.1 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-14 02:38:30 +02:00
Michael Niedermayer
0875b2651d doc/developer: Add terse documentation of assumed C implementation defined behavior 
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b706ddbae3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-05-14 00:21:49 +02:00
Michael Niedermayer
37589e6443 Update for 3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-12 02:24:58 +02:00
Michael Niedermayer
ad37fb86d7 doc/APIchanges: Fill in missing fields 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5b441d2981)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-12 02:22:51 +02:00
Michael Niedermayer
7182fbc471 doc/examples/decode_video: Fix format string vulnerability 
Fixes: CID1404843

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 23edd41a0d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-11 23:39:21 +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
Clément Bœsch
dcdd52101f Merge commit '90265814f993098d79b0a0f40745ecdb403fbf56' 
* commit '90265814f993098d79b0a0f40745ecdb403fbf56':
  examples/decode_audio: constify the AVCodec instance

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:45:51 +02:00
Clément Bœsch
9bed10afb8 doc/examples/encode_audio: add missing return 2017-03-29 13:45:09 +02:00
Clément Bœsch
878070cc56 Merge commit 'f5df897c4b61985e3afc89ba1290649712ff438e' 
* commit 'f5df897c4b61985e3afc89ba1290649712ff438e':
  examples/avcodec: split audio decoding into a separate example

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:43:47 +02:00
Clément Bœsch
780cc080d8 Merge commit 'f76698e759a08e8d3b629c06edb0439f474e7fee' 
* commit 'f76698e759a08e8d3b629c06edb0439f474e7fee':
  examples/encode_audio: use the AVFrame API for allocating the data

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:31:44 +02:00
Clément Bœsch
f38e7566c6 Merge commit 'c00a11ab383ff276a2ab2fdba577945e48d465be' 
* commit 'c00a11ab383ff276a2ab2fdba577945e48d465be':
  examples/encode_audio: constify AVCodec instances

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-29 13:30:16 +02:00
Clément Bœsch
b785af4868 Merge commit '40aaa8dadfd1c69ff4460d04750e1403b5535a6d' 
* commit '40aaa8dadfd1c69ff4460d04750e1403b5535a6d':
  examples/avcodec: split audio encoding into a separate example

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