summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* avcodec/ass: add ASS trailing \r\n in one single placeClément Bœsch2014-10-19
|
* avcodec/ass: assume raw=0 in ff_ass_add_rect_bprintClément Bœsch2014-10-19
|
* avcodec: add codec_whitelistMichael Niedermayer2014-10-19
| | | | | | This allows restricting decoders to a list of needed ones for improved security Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/utils: Display pixel format information as none ... if unknown ↵Michael Niedermayer2014-10-19
| | | | | | | | | | | | | | instead of omitting it This is similar to 20a5956b8daeee4cb59d6fa00ec809b02c04d7f8 The difference this change makes affects only rather few files but looks like: Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc vs. Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/libvpxenc: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers ↵Michael Niedermayer2014-10-19
| | | | | | in memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/wmv2enc: add priv_classMichael Niedermayer2014-10-18
| | | | | | Fixes ratecontrol code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/snowenc: add FF_MPV_COMMON_OPTSMichael Niedermayer2014-10-18
| | | | | | | | This fixes the ratecontrol code with snow adding FF_MPV_COMMON_OPTS is needed as the generic rate control options are currently in the (unrelated) MpegEncContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'Michael Niedermayer2014-10-18
|\ | | | | | | | | | | | | | | | | | | * commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45': lavc: make lmax/lmin into private options of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make lmax/lmin into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | avcodec/mjpegenc: add priv_class to encodersMichael Niedermayer2014-10-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40': lavc: make border_masking into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make border_masking into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866': lavc: deprecate unused mb_threshold field Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate unused mb_threshold fieldAnton Khirnov2014-10-18
| |
* | Merge commit '685be3d1aecf965281128f3b631ed965bcfa754d'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '685be3d1aecf965281128f3b631ed965bcfa754d': libvpxenc: add static-thresh private option Conflicts: libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libvpxenc: add static-thresh private optionAnton Khirnov2014-10-18
| | | | | | | | | | | | | | | | Currently, this option is accessed through AVCodecContext.mb_threshold, which originally controlled reusing MB data when transcoding mpeg to mpeg. Since the libvpx meaning is completely different from the original mpegvideo meaning, it is better to use a separate private option for this.
* | Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283': lavc: deprecate unused me_threshold field Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate unused me_threshold fieldAnton Khirnov2014-10-18
| |
* | Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6': lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of ↵Anton Khirnov2014-10-18
| | | | | | | | mpegvideo encoders
* | Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'a75c2eb25a62105c09b48521aef429dc8a231637': lavc: make rc_eq into private options of mpegvideo encoders Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_eq into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '946f95354ba76ef73c9b66889d86ab5fba4fb486': lavc: make rc_qmod_* into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_qmod_* into private options of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | | | | | | | * commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf': lavc: make rc_qsquish a private option of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: make rc_qsquish a private option of mpegvideo encodersAnton Khirnov2014-10-18
| |
* | Merge commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bae557edcea996328e8ff48b9e074a4210f7e6b4': dump: display codec tags when available Conflicts: libavcodec/utils.c See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dump: display codec tags when availableVittorio Giovara2014-10-17
| | | | | | | | For both audio and video.
* | Merge commit '66e9f839536238945fbfe9d2041b6891cb150e45'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | * commit '66e9f839536238945fbfe9d2041b6891cb150e45': libfdk-aacdec: Enable Dynamic Range Control Metadata Support Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libfdk-aacdec: Enable Dynamic Range Control Metadata SupportOmer Osman2014-10-17
| | | | | | | | | | | | | | | | | | | | For streams which contain DRC metadata, the FDK decoder is able to control rendering of the decoded output. The rendering parameters are detailed in fdk_aac_dec_options []. The default behavior is left up to the decoder. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/libfdk-aacdec: use av_feeep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-10-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93': libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support Conflicts: libavcodec/libfdk-aacdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata SupportOmer Osman2014-10-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FDK decoder is capable of producing mono and stereo downmix from multichannel streams. These streams may contain metadata that control the downmix process. The decoder requires an Ancillary Buffer in order to correctly apply downmix in streams containing downmix Metadata. The decoder does not have an API interface to inform of the presence of Metadata in the stream, and therefore the Ancillary Buffer is always allocated whenever a downmix is requested. When downmixing multichannel streams, the decoder requires the output buffer in aacDecoder_DecodeFrame call to be of fixed size in order to hold the actual number of channels contained in the stream. For example, for a 5.1ch to stereo downmix, the decoder requires that the output buffer is allocated for 6 channels, regardless of the fact that the output is in fact two channels. Due to this requirement, the output buffer is allocated for the maximum output buffer size in case a downmix is requested (and also during decoder init). When a downmix is requested, the buffer used for output during init will also be used for the entire duration the decoder is open. Otherwise, the initial decoder output buffer is freed and the decoder decodes straight into the output AVFrame. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Fix initialisers in dct-test.c.Carl Eugen Hoyos2014-10-16
| | | | | | | | | | | | | | | | Silences a warning when running fate on unusual platforms: libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces] libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces] libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces] libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]
* | avcodec/avcodec: more verbose documentation for time_baseMichael Niedermayer2014-10-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/avcodec: fix non doxy commentMichael Niedermayer2014-10-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | * commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d': imc: fix order of operations in coefficients read Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * imc: fix order of operations in coefficients readVittorio Giovara2014-10-15
| | | | | | | | Reported-by: Ruoyu <liangry@ucweb.com>
* | avcodec/ass: add FFmpeg signatureClément Bœsch2014-10-15
| |
* | avcodec/ass_split: realign after addition of new fieldsClément Bœsch2014-10-15
| |
* | avcodec/ass_split: assume default order when "Format:" line is not foundClément Bœsch2014-10-15
| | | | | | | | | | Fixes the decoding of the ASS stream in a mkv from a fansub release from Coalgirls.
* | avcodec/ass_split: extend recognized fields in ASS splitterClément Bœsch2014-10-15
| | | | | | | | This simplifies the logic for the fix in the next commit.
* | avcodec/ass: output missing fields in AVSubtitles and output filesClément Bœsch2014-10-15
| | | | | | | | Fixes Ticket #3207
* | avcodec/dpx: fix framerateMichael Niedermayer2014-10-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1: fix time_base and framerateMichael Niedermayer2014-10-15
| | | | | | | | | | | | | | They are not just inverses of each other. This should restore behavior to before the introduction of framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/h264: fix time_base and framerateMichael Niedermayer2014-10-15
| | | | | | | | | | | | | | They are not just inverses of each other. This should restore behavior to before the introduction of framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: fix time_base and framerateMichael Niedermayer2014-10-15
| | | | | | | | | | | | | | They are not just inverses of each other. This should restore behavior to before the introduction of framerate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: fix time_base after the framerate additionMichael Niedermayer2014-10-15
| | | | | | | | | | | | time_base != 1/framerate for example for interlaced video Signed-off-by: Michael Niedermayer <michaelni@gmx.at>