summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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.
* | avformat/utils: print more information with av_dlog() in compute_pkt_fields()Michael Niedermayer2014-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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
* | avformat/movenc: add support for syncframes concatenation for E-AC-3.Benoit Fouet2014-10-13
| | | | | | | | | | | | | | E-AC-3 samples should contain 6 audio blocks, so concatenate syncframes in order to achieve this. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | postproc: fix qp countMichael Niedermayer2014-10-13
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: fix mix of declaration and statementMichael Niedermayer2014-10-13
| | | | | | | | 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>
* | mov.c: allow reading fragment start dts/pts from fragmented mp4Mika Raento2014-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new option to the mov demuxer: -use_mfra_for (pts|dts). When it's given and moofs and a MFRA are present, the MFRA's TFRAs are read for fragment start times. Unfortunately some programs that produce fragmented mp4s use the TFRA time field for dts and some for pts. There is no realistic way to detect which is the case, hence the responsibility is punted onto the user. This also means that no behavioural change is enabled by default - you must pass either dts or pts for anything to happen. Without this change, timestamps for some discontinuous fragmented mp4 are wrong, and cause audio/video desync and are not usable for generating HLS. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_pp: support AV_PIX_FMT_GRAY8Michael Niedermayer2014-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libpostproc: support grayscaleMichael Niedermayer2014-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '76c70e33d2244a688832f03b53862eb5d9ad3b01'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | * commit '76c70e33d2244a688832f03b53862eb5d9ad3b01': icecast: Do not use chunked post Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * icecast: Do not use chunked postMark McGough2014-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | Icecast uses HTTP 1.0 while Libav uses HTTP 1.1 and enables by default chunked post. Icecast actually forwards the HTTP chunk headers to the listener as part of the media stream (without the chunk encoding HTTP headers) causing the players to lose sync. Disabling the option is enough to feed icecast properly. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e44ee1eb8db7393e9d43207c2e1812720e292e6d'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | * commit 'e44ee1eb8db7393e9d43207c2e1812720e292e6d': movenc: Simplify code by using an existing local pointer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Simplify code by using an existing local pointerMartin Storsjö2014-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | | | | | | | * commit 'dad12ce452a9d69c0d9d53c375003947d5f1b02e': movenc: Print a warning for an unhandled case of nonzero start dts with empty_moov Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Print a warning for an unhandled case of nonzero start dts with ↵Martin Storsjö2014-10-12
| | | | | | | | | | | | empty_moov Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee'Michael Niedermayer2014-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dbb472cb2f2f799295a12b4922a6a8be2cccfdee': movenc: Write edit lists for fragmented files as well, if necessary Conflicts: libavformat/movenc.c The default for writing EDTS for fragmented mp4 is left at disabled this can be overridden via command line with -use_editlist but EDTS + fragments still does not fully work, which is why it is left disabled by default Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Write edit lists for fragmented files as well, if necessaryMartin Storsjö2014-10-12
| | | | | | | | | | | | | | | | | | | | | | This is necessary to get the right timestamp offset for content that starts with dts != 0. This currently only helps when writing fragmented files with a non-empty moov atom. When writing an empty moov atom, we don't have any packets yet, so we don't know the starting dts for the tracks. Signed-off-by: Martin Storsjö <martin@martin.st>
* | fate: add test for vp90-2-trac3849.webmJames Almer2014-10-12
| | | | | | | | | | | | | | Regression test for the bug from trac ticket #3849 fixed in commit 14e30255 Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '95ee4e2ce774e0339632d067161596bf3dadfc72'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | * commit '95ee4e2ce774e0339632d067161596bf3dadfc72': movenc: Add some comments explaining subtle details in writing the edit lists Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add some comments explaining subtle details in writing the edit listsMartin Storsjö2014-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '72f801619a1ae91969fee9a7d72519422433c998'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '72f801619a1ae91969fee9a7d72519422433c998': movenc: Adjust edit lists to trim out parts of tracks with negative pts Conflicts: libavformat/movenc.c See: 66b45d8f7a1bfba1065286361ab571cb9cfd87c6 See: 14fd34d73bb0bcb227b62506fb51d63751c9b190 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Adjust edit lists to trim out parts of tracks with negative ptsMichael Niedermayer2014-10-12
| | | | | | | | | | | | | | | | | | This makes sure that audio preroll for e.g. AAC is signaled correctly. Previously we only wrote the edit list correctly if we had negative dts but started with pts == 0 (e.g. for video with B-frames). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8bef43388132b53f59a6e90add18900a3bb4cc60'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | * commit '8bef43388132b53f59a6e90add18900a3bb4cc60': smoothstreamingenc: Simplify code by removing a redundant variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: Simplify code by removing a redundant variableMartin Storsjö2014-10-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | postproc/postprocess: fix quant store for fq modeMichael Niedermayer2014-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_pp: add yuv 4:4:0 supportMichael Niedermayer2014-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | postprocess: add YUV 4:4:0 supportMichael Niedermayer2014-10-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter: remove obsolete FF_API_DRAWTEXT_OLD_TIMELINE cruftJames Almer2014-10-12
| |
* | 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>
* | Merge commit 'bd239c9a2e151c0aeeb653a571f130aae7320894'Michael Niedermayer2014-10-12
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'bd239c9a2e151c0aeeb653a571f130aae7320894': lavf: Don't drop both pts and dts if timestamps are invalid Conflicts: libavformat/utils.c tests/ref/fate/vc1-ism See: cd6851c5ef281e44af7028e08597c4dfb73d880f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Don't drop both pts and dts if timestamps are invalidMichael Niedermayer2014-10-12
| | | | | | | | | | | | | | | | | | In these cases, only drop dts. Because if we drop both we have no timestamps at all for some files. This improves playback of HLS streams from GoPro cameras. Signed-off-by: Martin Storsjö <martin@martin.st>
* | 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>
* | vf_drawtext: add missing clear of pointers after av_expr_free()Karl Kiniger2014-10-11
| | | | | | | | | | | | | | | | | | | | Fixes segfault when using sendcmd with drawtext. Since LIBAVFILTER_VERSION_MAJOR 5 FF_API_DRAWTEXT_OLD_TIMELINE evaluates to 0. Signed-off-by: Karl Kiniger <karl.kiniger@med.ge.com> 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>
* | ffmpeg_opt: abort if -to <= -ssSimon Thelen2014-10-11
| | | | | | | | | | | | | | | | | | Makes ffmpeg abort instead of continuing when stop_time <= start_time. Closes ticket #4015. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> 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>
* | avutil/lzo: fix resource leakRuoyu2014-10-11
| | | | | | | | | | Signed-off-by: Ruoyu <liangry@ucweb.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: support internal scaler cascadesMichael Niedermayer2014-10-11
| | | | | | | | | | | | Fixes Ticket3170 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: print aspect_ratio_info in debug outputMichael Niedermayer2014-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>