summaryrefslogtreecommitdiff
path: root/libavcodec/options_table.h
Commit message (Collapse)AuthorAge
* Merge commit '5168026a05258537f1c48ca95c1776b1554997f4'Clément Bœsch2017-04-08
|\ | | | | | | | | | | | | * commit '5168026a05258537f1c48ca95c1776b1554997f4': options_table: Do not rely on enum size as option bound Merged-by: Clément Bœsch <u@pkh.me>
| * options_table: Do not rely on enum size as option boundVittorio Giovara2016-12-02
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * lavc: Add hevc main10 profile to avconv cliVittorio Giovara2016-11-08
| |
* | Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'Clément Bœsch2017-03-31
|\| | | | | | | | | | | | | * commit '17dac56b8fdd80c594c39b76de3f27a7949afbde': lavu: Rename ycgco color space appropriately Merged-by: Clément Bœsch <cboesch@gopro.com>
| * lavu: Rename ycgco color space appropriatelyVittorio Giovara2016-11-08
| | | | | | | | | | | | Planes are ordered as the name suggests now. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * options_table: Remove a now unnecessary include of config.hMartin Storsjö2016-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The include of config.h was added in 2012 in 1d9c2dc8, due to the use of CONFIG_SNOW_ENCODER ifdefs within options_table.h. When the snow codec was dropped later (in a0c5917f8 in 2013), this include no longer served any purpose. options_table.h is included in builds for the host as well, when building documentation. config.h should not be included in code that is built for the host, since it can contain workarounds for the target compiler/environment, like adding a missing define of restrict, defining getenv(x) to NULL for environments that lack getenv. The seemingly innocent include reordering in 2025d37871 broke builds that have getenv(x) defined to NULL in config.h (Windows CE and Windows Phone/RT), since libavcodec/options_table.h include config.h, while libavformat/options_table.h end up bringing in more system headers, and those system headers can contain a proper definition of getenv, which clash with the getenv define in config.h. This was avoided earlier as long as libavformat/options_table.h (or avformat.h) was included before libavcodec/options_table.h. This fixes builds for Windows Phone/RT and CE. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104': lavu: Add JEDEC P22 color primaries Merged-by: Clément Bœsch <u@pkh.me>
| * lavu: Add JEDEC P22 color primariesVittorio Giovara2016-10-21
| |
* | avcodec: Add max_pixels optionsMichael Niedermayer2016-12-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/options_table: make channel_layouts uint64Michael Niedermayer2016-11-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | options_table: limit codec parameters to sane valuesAndreas Cadhalpun2016-11-18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec/mpeg4videodec: Workaround interlaced mpeg4 edge MC bugMichael Niedermayer2016-11-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '7a745f014f528d1001394ae4d2f4ed1a20bf7fa2'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | * commit '7a745f014f528d1001394ae4d2f4ed1a20bf7fa2': options_table: Add aliases for color properties Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * options_table: Add aliases for color propertiesVittorio Giovara2016-06-27
| | | | | | | | All option names now match the ones provided by the av_color_*_name().
* | Merge commit 'f172e22d6aed0bff36e975bafb0183b6779f9444'Hendrik Leppkes2016-11-13
|\| | | | | | | | | | | | | * commit 'f172e22d6aed0bff36e975bafb0183b6779f9444': pixdesc: Add aliases to SMPTE color properties Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * pixdesc: Add aliases to SMPTE color propertiesVittorio Giovara2016-06-27
| | | | | | | | | | Drop ST from names and symbols, it does not add anything distinctive or descriptive.
* | lavc: Add hevc main10 profile to ffmpeg cliVittorio Giovara2016-11-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'a8164323374e86ce5f93759230868c98356833a2'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8164323374e86ce5f93759230868c98356833a2': pixdesc: Add new SMPTE 431, 432, and 2085 color properties Conflicts: libavcodec/options_table.h libavcodec/version.h libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h Merged-by: James Almer <jamrial@gmail.com>
| * pixdesc: Add new SMPTE 431, 432, and 2085 color propertiesVittorio Giovara2016-06-21
| | | | | | | | | | | | Appeared in H.264 2016/02. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'James Almer2016-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d560d38deca1e4705e6d3784d737363b9c830fe': pixfmt: Add ARIB STD-B76 color transfer characteristic See 785038c92cc7fc1da437576382083246ca598fce Conflicts: libavcodec/options_table.h libavcodec/version.h libavutil/pixdesc.c libavutil/version.h Merged-by: James Almer <jamrial@gmail.com>
| * pixfmt: Add ARIB STD-B76 color transfer characteristicNeil Birkbeck2016-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding hybrid log-gamma (https://en.wikipedia.org/wiki/Hybrid_Log-Gamma) based on the standardization in ARIB STD-B67: http://www.arib.or.jp/english/html/overview/doc/2-STD-B67v1_0.pdf The choice of enum value of 18 is consistent with HEVC: http://phenix.it-sudparis.eu/jct/doc_end_user/current_document.php?id=10481 And also with latest proposal for color format in mkv: https://mailarchive.ietf.org/arch/search/?email_list=cellar&gbt=1&q=Colour+Format+proposal Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/me_cmp: add median SAD compare functionStanislav Dolganov2016-08-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21
|\| | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * cosmetics: Drop empty comment linesDiego Biurrun2016-02-18
| |
* | avcodec: Add "sar" alias to "aspect" option of video encodersAndrey Utkin2016-05-06
| | | | | | | | | | | | | | | | It is impossible to pass "aspect" parameter to encoder from ffmpeg CLI because option from lavc/options_table.h is eclipsed by option with same name in ffmpeg_opt.c, which has different meaning (DAR, not SAR). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/options_table: fix strict compliance constant flags to match the ↵Michael Niedermayer2016-05-02
| | | | | | | | | | | | strict field Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc: deprecate decoded ass subtitles with timingsClément Bœsch2016-02-26
| |
* | lavc/options: add ass_ro_flush_noop to flags2Clément Bœsch2016-02-26
| |
* | lavc: allow subtitle text format to be ASS without timingClément Bœsch2016-02-26
| |
* | options_table: update maximum bitrate limitRostislav Pehlivanov2016-02-10
| | | | | | | | | | | | | | The type of the option has been changed but the limit was apparently forgotten. Some video codes can handle bitrates of over ~2.2 Gbps (like VC-2). Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99'Derek Buitenhuis2016-02-03
|\| | | | | | | | | | | | | * commit '0e9c4fe254073b209970df3e3cb84531bc388e99': lavc: Move pre_me to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move pre_me to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607'Derek Buitenhuis2016-02-03
|\| | | | | | | | | | | | | * commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607': lavc: Move me_penalty_compensation to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move me_penalty_compensation to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc. It is a very codec-specific options, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'Derek Buitenhuis2016-02-03
|\| | | | | | | | | | | | | * commit '2862b63783b5556f7f3fb2d097629bc6879f833a': lavc: Move prediction_method to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move prediction_method to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | | | | | This options is only used by huffyuv, ffvhuv, jpegls, mjpeg, mpegvideoenc, png, utvideo. It is a very codec-specific options, so deprecate the global variant. Set proper limits to the maximum allowed values, and update utvideoenc tests to use the new option name. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '243df1351d2d928caa084a5704ed783f0b83f072'Derek Buitenhuis2016-01-31
|\| | | | | | | | | | | | | * commit '243df1351d2d928caa084a5704ed783f0b83f072': lavc: Move {min,max}_prediction_order to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move {min,max}_prediction_order to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | These options are only used by alac and flac. They are very codec-specific options, so deprecate the global variants. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'Derek Buitenhuis2016-01-31
|\| | | | | | | | | | | | | * commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd': lavc: Move rtp_payload_size to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move rtp_payload_size to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | | | | | This option is only used by mpegvideoenc and openh264. It is a very codec-specific option, so deprecate the global variant. The openh264 option is dropped altogether since it is just a fallback for -max_nal_size anyway. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'd749615333084e62c9fcc480d1ae466369fdf14f'Derek Buitenhuis2016-01-31
|\| | | | | | | | | | | | | * commit 'd749615333084e62c9fcc480d1ae466369fdf14f': lavc: Move timecode_frame_start to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move timecode_frame_start to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpeg2. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '96c373c7704aeb1cc1d2c275fbb5d71777665589': lavc: Move context_model to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move context_model to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | | | This option is only used by ffv1 and ffvhuff. It is a very codec-specific option, so deprecate the global variant. Improve documentation a little. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '12b49769223234673db1003d9c43e7483ceb0282'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '12b49769223234673db1003d9c43e7483ceb0282': lavc: Move mpeg_quant to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move mpeg_quant to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc, and xvid. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '1482aff2048511b821ff9feac19426113cc641a2'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '1482aff2048511b821ff9feac19426113cc641a2': lavc: Move noise_reduction to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavc: Move noise_reduction to codec private optionsVittorio Giovara2016-01-21
| | | | | | | | | | | | | | This option is only used by mpegvideoenc, x264, xavs, and vpx. It is a very codec-specific option, so deprecate the global variant. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d'Derek Buitenhuis2016-01-28
|\| | | | | | | | | | | | | * commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d': lavc: Move scenechange_threshold to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>