summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | * commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a': rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevc Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevcMartin Storsjö2015-02-21
| | | | | | | | | | | | Add a parameter for skipping a number of bytes at the start of each nal. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | * commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5': rtpdec_h264: Generalize parse_sprop_parameter_sets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Generalize parse_sprop_parameter_setsMartin Storsjö2015-02-21
| | | | | | | | | | | | | | Don't write directly into an AVCodecContext, write into given pointers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6': tests: drop bc dependency Conflicts: tests/fate-run.sh See: d47eeff2741a9ad9eb4398c1d844dd4f638d6ee4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tests: drop bc dependencyClément Bœsch2015-02-21
| | | | | | | | | | | | | | We already have a dependency on awk and bc is sometimes not found in the base system. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | * commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5': h264: initialize H264Context.avctx in init_thread_copy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: initialize H264Context.avctx in init_thread_copyAnton Khirnov2015-02-21
| | | | | | | | | | This prevents using a wrong (first thread's) AVCodecContext if decoding a frame in the first pass over all threads fails.
* | Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40': h264: only ref cur_pic in update_thread_context if it is initialized Conflicts: libavcodec/h264_slice.c See: 0fc01ae33c7712168aab0f98c5715b40da0b5f03 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: only ref cur_pic in update_thread_context if it is initializedAnton Khirnov2015-02-21
| | | | | | | | | | It may be empty if the previous thread's decode call did not contain a valid frame.
* | Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | * commit '9abc80f1ed673141326341e26a05c3e1f78576d0': libavcodec: Make use of av_clip functions Conflicts: libavcodec/takdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: Make use of av_clip functionsPeter Meerwald2015-02-21
| | | | | | | | | | Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | * commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc': libavutil: Add ARM av_clip_intp2_arm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Add ARM av_clip_intp2_armPeter Meerwald2015-02-21
| | | | | | | | | | | | | | | | | | | | add ARM code for implementing av_clip_intp2 using the ssat instruction on Cortex-A8, av_clip_intp2_arm() is faster than av_clip_intp2_c() and the generic av_clip(), about -19% Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'bf07d813f6c88b5a76980f321cf7272d799c4216'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | * commit 'bf07d813f6c88b5a76980f321cf7272d799c4216': libavutil: Add av_clip_intp2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Add av_clip_intp2Peter Meerwald2015-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there already is a function, av_clip_uintp2() that clips a signed integer to an unsigned power-of-two range, i.e. 0,2^p-1 this patch adds a function av_clip_intp2() that clips a signed integer to a signed power-of-two range, i.e. -(2^p),(2^p-1) the new function can be used as a special case for av_clip(), e.g. av_clip(x, -8192, 8191) can be rewritten as av_clip_intp2(x, 13) there are ARM instructions, usat and ssat resp., which map nicely to these functions (see next patch) Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Makefile: improve DBG option for asmChristophe Gisquet2015-02-21
| | | | | | | | | | | | This improves the cleanup, dependency generation and DBG command issuing. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '3fe26bb60858951710a42065c8183cce100d632a'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '3fe26bb60858951710a42065c8183cce100d632a': hlsenc: write playlist into a temp file and replace the original atomically Conflicts: libavformat/hlsenc.c See: da97e4c64a289ac83c3d53554ff36cdd6586537c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: write playlist into a temp file and replace the original atomicallyHendrik Leppkes2015-02-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/hlsenc: Use ff_rename() only for local filesMichael Niedermayer2015-02-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hlsenc: write playlist into a temp file and replace the original atomicallyHendrik Leppkes2015-02-21
| | | | | | | | | | Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200'Michael Niedermayer2015-02-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200': hlsenc: remove the AVIOContext for the playlist from the muxer context Conflicts: libavformat/hlsenc.c See: 28bf05e7b50e0920ff9ea4deded1fd1d7b817616 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: remove the AVIOContext for the playlist from the muxer contextHendrik Leppkes2015-02-20
| | | | | | | | | | | | Its only used in one function, having it in the context serves no purpose. Signed-off-by: Martin Storsjö <martin@martin.st>
* | swresample: add av_cold to init functionsMichael Niedermayer2015-02-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/ffmenc: do not fail on missing codecLukasz Marek2015-02-21
| | | | | | | | | | | | | | | | | | | | | | ffm encoder fails when codec is not found. It may happen when stream is being copied. This commit allows to store such stream and provides backward compatibility with version prior 2.5 release. fixes #4266 Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b': libavcodec: Don't use av_cold annotation in twinvq header file Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavcodec: Don't use av_cold annotation in twinvq header filePeter Meerwald2015-02-20
| | | | | | | | | | Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99': libavresample: Annotate AARCH64 init function with av_cold Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavresample: Annotate AARCH64 init function with av_coldPeter Meerwald2015-02-20
| | | | | | | | | | Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | | | | | | | * commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7': rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a Conflicts: libavformat/rtpdec_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_aMartin Storsjö2015-02-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'a335ed767161c6da2815371177cfd5e40f78e5b7': rtpdec_h264: Remove an unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Remove an unnecessary checkMartin Storsjö2015-02-20
| | | | | | | | | | | | | | | | If src_len is too small for nal_size, we already print a warning above, and the next step is to check the while loop condition anyway, so this one serves no purpose. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '176903ce833ce7469f411640e9748a0d549b5285'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit '176903ce833ce7469f411640e9748a0d549b5285': rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_aMartin Storsjö2015-02-20
| | | | | | | | | | | | | | Previously, errors were only logged but the code kept on trying, and never actually returning the error as a return value. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4': rtpdec_h264: Make a parameter pointer const Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Make a parameter pointer constMartin Storsjö2015-02-20
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit '7650caf013f45ebebf128855735a0c6350836ea4': rtpdec_h264: Use av_realloc instead of av_malloc+mempcy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Use av_realloc instead of av_malloc+mempcyMartin Storsjö2015-02-20
| | | | | | | | | | | | This is similar to what was done for rtpdec_hevc in ced7238cd01. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd': rtpdec_h264: Include the right header for AV_RB16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_h264: Include the right header for AV_RB16Martin Storsjö2015-02-20
| | | | | | | | | | | | | | Including libavcodec/get_bits.h is superfluous for AV_RB16 - nothing in this file uses any actual bitstream reader. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ba2e07909b848e583245856a59d0fe1dd08f917e'Michael Niedermayer2015-02-20
|\| | | | | | | | | | | | | * commit 'ba2e07909b848e583245856a59d0fe1dd08f917e': rtpdec_vp8: Set the keyframe flag Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_vp8: Set the keyframe flagMartin Storsjö2015-02-20
| | | | | | | | | | | | | | This allows the output to be used with stream copy, which discards packet from the start until the first keyframe. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/omadec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/vqf: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wtvdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mvdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/apngdec: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | | | | | Missed this hunk in first commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/gxf: Use 64bit for res to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/idcin: Use 64bit for ret to avoid overflowMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 05:33:08 +0000