summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* 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>
* | Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41': lavc: deprecate the use of AVCodecContext.time_base for decoding Conflicts: libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpegvideo_parser.c libavcodec/utils.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: deprecate the use of AVCodecContext.time_base for decodingAnton Khirnov2014-10-15
| | | | | | | | | | | | | | | | | | | | | | When decoding, this field holds the inverse of the framerate that can be written in the headers for some codecs. Using a field called 'time_base' for this is very misleading, as there are no timestamps associated with it. Furthermore, this field is used for a very different purpose during encoding. Add a new field, called 'framerate', to replace the use of time_base for decoding.
* | Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | | | | | | | * commit 'd565fef1b83b6c5f8afb32229260b79f67c68109': vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level checkRémi Denis-Courmont2014-10-15
| | | | | | | | | | | | | | | | | | | | | | | | | | Decoding acceleration may work even if the codec level is higher than the stated limit of the VDPAU driver. Or the problem may be considered acceptable by the user. This flag allows skipping the codec level capability checks and proceed with decoding. Applications should obviously not set this flag by default, but only if the user explicitly requested this behavior (and presumably knows how to turn it back off if it fails). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'Michael Niedermayer2014-10-15
|\| | | | | | | | | | | | | * commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193': vdpau: have av_vdpau_bind_context() fail on unsupported flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: have av_vdpau_bind_context() fail on unsupported flagRémi Denis-Courmont2014-10-15
| | | | | | | | | | | | Currently, no flags are supported. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointerMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the ↵Michael Niedermayer2014-10-14
| | | | | | | | | | | | pointers as well Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flac_parser: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/flac_parser: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3enc_template: use the initial_padding fieldMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2df0c32ea12ddfa72ba88309812bfb13b674130f'Michael Niedermayer2014-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2df0c32ea12ddfa72ba88309812bfb13b674130f': lavc: use a separate field for exporting audio encoder padding Conflicts: libavcodec/audio_frame_queue.c libavcodec/avcodec.h libavcodec/libvorbisenc.c libavcodec/utils.c libavcodec/version.h libavcodec/wmaenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use a separate field for exporting audio encoder paddingAnton Khirnov2014-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the amount of padding inserted at the beginning by some audio encoders, is exported through AVCodecContext.delay. However - the term 'delay' is heavily overloaded and can have multiple different meanings even in the case of audio encoding. - this field has entirely different meanings, depending on whether the codec context is used for encoding or decoding (and has yet another different meaning for video), preventing generic handling of the codec context. Therefore, add a new field -- AVCodecContext.initial_padding. It could conceivably be used for decoding as well at a later point.
* | avcodec/aacdec: print element types when debug startcode is setMichael Niedermayer2014-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'Michael Niedermayer2014-10-14
|\| | | | | | | | | | | | | * commit 'c80a816142699dea9cf9fa66689a7838a487ed7e': h263dec: call get_format() on resolution changes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: call get_format() on resolution changesRémi Denis-Courmont2014-10-13
| | | | | | | | Fail safe if the pixel format changes.
* | Merge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | * commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9': h263dec: call get_format after setting resolution and profile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: call get_format after setting resolution and profileRémi Denis-Courmont2014-10-13
| | | | | | | | Bug-Id: 541
* | avcodec/aacdec: map LFE[0] to SCE[1] for 4.0 audio.Benoit Fouet2014-10-13
| | | | | | | | | | | | Fixes ticket #3930 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec/libtwolame: fix null pointer dereferencePaul B Mahol2014-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/eatgv: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/eatqi: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/error_resilience: avoid pointer arithmetic with NULLMichael Niedermayer2014-10-12
| | | | | | | | | | | | | | | | move the code after the existing NULL check Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: sanity check bitsMichael Niedermayer2014-10-12
| | | | | | | | | | | | | | | | Fixes undefined shift Fixes: asan_heap-oob_16668e9_2_asan_heap-oob_16668e9_346_miss_congeniality_pegasus_mjpg.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dct: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dirac_parser: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/eamad: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer2014-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresenc_ks: use chroma sampling in autoselectionChristophe Gisquet2014-10-11
| | | | | | | | | | | | | | If the chroma planes aren't subsampled, automatically select the 4:4:4:4 profile. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>