summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* ffplay: remove manual bug option handling codeMarton Balint2014-10-17
| | | | | | It is supported as a codec option, and those are already parsed. Signed-off-by: Marton Balint <cus@passwd.hu>
* ffplay: remove delays when paused from video and subtitle threadMarton Balint2014-10-17
| | | | | | Once the frame queue is full, we will wait anyway. Signed-off-by: Marton Balint <cus@passwd.hu>
* hlsenc.c, segment.c: propagate defaults to mpegtsMika Raento2014-10-17
| | | | | | | | | This fixes the abnormally high ts overhead in the files produced by the HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For example makes it much more likely that it can produces streams that fit under the 64kb App store limit. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* 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>
* | avformat/id3v2: support buggy id3v2.3 tag length in id3v2.4Benoit Fouet2014-10-17
| | | | | | | | | | | | | | | | | | Some encoders do not use syncsafe sizes in v2.4 id3 tags. Check the next tag to try to choose between the two. Fixes ticket #4003 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gitignore: add test_copy.ffmetaBenoit Fouet2014-10-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | * commit 'e65c776d18dc14df8a279e017760862f9fc8763b': rtmpproto: Add getStreamLength call to query duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Add getStreamLength call to query durationUwe L. Korn2014-10-17
| | | | | | | | | | | | | | | | | | | | In (non-live) streams with no metadata, the duration of a stream can be retrieved by calling the RTMP function getStreamLength with the playpath. The server will return a positive duration upon the request if the duration is known, otherwise either no response or a duration of 0 will be returned. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '324b23dde1bc8638959eb32419c95a93906db272'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | * commit '324b23dde1bc8638959eb32419c95a93906db272': rtmpproto: Add function to read a number response Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Add function to read a number responseUwe L. Korn2014-10-17
| | | | | | | | | | | | | | | | | | Packets that contain a number as a result to a rtmp function call are structured the same way (String, Number, Null, Number). This new method also includes more bounds checks to better handle packets that are not structured as expected. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | | | * commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4': cmdutils: Use the correct guard Conflicts: cmdutils.c See: 35daf3ca8173f80f200860e06a410ced31a8b360 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Use the correct guardLuca Barbato2014-10-17
| | | | | | | | | | | | | | The OptionDef arrays are terminated with a { NULL } element not NULL. CC: libav-stable@libav.org Bug-Id: CID 703769
* | Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | * commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee': avformat: Make avformat_free_context handle NULL See: ee23dcf534801931c13f9f534586b56e231d3085 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Make avformat_free_context handle NULLLuca Barbato2014-10-17
| | | | | | | | | | | | | | Work as the other free()-like functions. Bug-Id: CID 1087081 CC: libav-stable@libav.org
* | Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a': avconv: check return value Conflicts: ffmpeg.c See: 4930cd13d634d5f4e284de3a955d5c6a84fd65e2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: check return valueVittorio Giovara2014-10-17
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1224275
* | Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581': avconv: fix leak in filter error Conflicts: ffmpeg_filter.c See: 14369f59c5ad1fb817fb4d94073f31cccf12b556 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: fix leak in filter errorVittorio Giovara2014-10-17
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1005311
* | Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403': avprobe: Remove a pointless check Conflicts: avprobe.c No change as the code does not exist in ffprobe Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avprobe: Remove a pointless checkLuca Barbato2014-10-17
| | | | | | | | | | | | | | The element is always valid. CC: libav-stable@libav.org Bug-Id: CID 732276
* | Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | * commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc': avplay: Always free opts Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: Always free optsLuca Barbato2014-10-17
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733793
* | Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | | | | | | | * commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767': avplay: Always free find_stream_info options Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: Always free find_stream_info optionsLuca Barbato2014-10-17
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1238794
* | tests/fate/mpeg4: fix samples pathMichael Niedermayer2014-10-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | * commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48': fate: add mpeg4 tests for frame size changes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add mpeg4 tests for frame size changesJanne Grunau2014-10-17
| |
* | avformat/m4vdec: mark as possibly containing discontinuitiesMichael Niedermayer2014-10-17
| | | | | | | | | | | | This will be needed for the resolution change mpeg4 test Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/filters.texi: fix several typos in the vidstab* sectionsMoritz Barsnick2014-10-17
| | | | | | | | | | | | | | Also create an anchor for the unsharp filter, and references to it in its mentions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/vf_noise: move asm code to a separate fileJames Almer2014-10-17
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | swresample/resample: fix invert_initial_buffer() after flushMichael Niedermayer2014-10-16
| | | | | | | | | | | | | | Fixes: asan_heap-uaf_2071250_7_139.ogg Fixes: assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swresample: do not put multiple statements in one lineMichael Niedermayer2014-10-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.Benoit Fouet2014-10-16
| | | | | | | | | | | | | | dlen is only read when CONFIG_ZLIB is set, so mark it as possibly unused. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_noise: Use a separate seed for each planeMichael Niedermayer2014-10-16
| | | | | | | | | | | | This should reduce the correlation between planes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_noise: use per component rand_shiftMichael Niedermayer2014-10-16
| | | | | | | | | | | | This allows using different shifts per plane Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_noise: move shift calculation to filter_frame()Michael Niedermayer2014-10-16
| | | | | | | | | | | | This makes the temporal noise case deterministic with threads Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_noise: fix high resolution supportMichael Niedermayer2014-10-16
| | | | | | | | | | Fixes Ticket4017 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'Michael Niedermayer2014-10-16
|\| | | | | | | | | | | | | * commit '979932378ae3fbf452e312eb759cc7ce175f78de': ismindex: use tfhd default duration if no sample duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: use tfhd default duration if no sample durationMika Raento2014-10-16
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'Michael Niedermayer2014-10-16
|\| | | | | | | | | | | | | | | * commit '460b509a34fb5fad3bedac8429f53594d3923ea8': rtsp: Check a memory allocation See: c69f230a3afbfa30d7a978a6961b1ddcc774499f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Check a memory allocationMichael Lynch2014-10-16
| | | | | | | | | | CC: libav-stable@libav.org 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]
* | mpegts: add the judgement if a new program is created successfullyDi Wu2014-10-16
| | | | | | | | | | | | | | | | Add the judement after create a new program to avoid segment fault. Signed-off-by: Di Wu <di1028.wu@samsung.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerateMichael Niedermayer2014-10-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 16:32:30 +0000