Michael Niedermayer
7fd732b758
Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'
...
* commit '16163e6bf2d446c06d4dd053c0852074bb50508d':
rtpdec_h264: Fix nal type counting after refactoring
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 12:44:09 +01:00
Michael Niedermayer
34c58618be
Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'
...
* 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>
2015-02-21 12:32:28 +01:00
Michael Niedermayer
621450e786
Merge commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5'
...
* commit '48183b3ad45c95e386a4cb02e1a68b53e6835ac5':
rtpdec_h264: Generalize parse_sprop_parameter_sets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 12:25:09 +01:00
Michael Niedermayer
9b41bf5c3d
Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'
...
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
tests: drop bc dependency
Conflicts:
tests/fate-run.sh
See: d47eeff274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 12:08:31 +01:00
Michael Niedermayer
4b55a7e1ce
Merge commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5'
...
* commit 'a06b0b1295c51d100101e0ca0434e199ad6de6b5':
h264: initialize H264Context.avctx in init_thread_copy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:53:00 +01:00
Michael Niedermayer
6458e4750f
Merge commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40'
...
* commit '0dea4c77ccf5956561bb8991311b3d834bb5fa40':
h264: only ref cur_pic in update_thread_context if it is initialized
Conflicts:
libavcodec/h264_slice.c
See: 0fc01ae33c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:45:42 +01:00
Michael Niedermayer
66d79aa2e1
Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'
...
* commit '9abc80f1ed673141326341e26a05c3e1f78576d0':
libavcodec: Make use of av_clip functions
Conflicts:
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:27:24 +01:00
Michael Niedermayer
1253091d6f
Merge commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc'
...
* commit '76ce9bd8e26dcb3652240a1072840ff4011d7cdc':
libavutil: Add ARM av_clip_intp2_arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:15:32 +01:00
Michael Niedermayer
88d850ecb3
Merge commit 'bf07d813f6c88b5a76980f321cf7272d799c4216'
...
* commit 'bf07d813f6c88b5a76980f321cf7272d799c4216':
libavutil: Add av_clip_intp2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 11:13:34 +01:00
Martin Storsjö
16163e6bf2
rtpdec_h264: Fix nal type counting after refactoring
...
This fixes builds with -DDEBUG after f0a874799
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:32:38 +02:00
Martin Storsjö
a3cc519d1f
rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevc
...
Add a parameter for skipping a number of bytes at the start of each nal.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:32:36 +02:00
Martin Storsjö
48183b3ad4
rtpdec_h264: Generalize parse_sprop_parameter_sets
...
Don't write directly into an AVCodecContext, write into given
pointers.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:32:31 +02:00
Clément Bœsch
a982c5d74f
tests: drop bc dependency
...
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>
2015-02-21 11:17:45 +02:00
Anton Khirnov
a06b0b1295
h264: initialize H264Context.avctx in init_thread_copy
...
This prevents using a wrong (first thread's) AVCodecContext if decoding
a frame in the first pass over all threads fails.
2015-02-21 09:29:48 +01:00
Anton Khirnov
0dea4c77cc
h264: only ref cur_pic in update_thread_context if it is initialized
...
It may be empty if the previous thread's decode call did not contain a
valid frame.
2015-02-21 09:29:27 +01:00
Christophe Gisquet
3fdcb8ccdc
Makefile: improve DBG option for asm
...
This improves the cleanup, dependency generation and DBG command issuing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 03:23:55 +01:00
Michael Niedermayer
f56f0e091f
Merge commit '3fe26bb60858951710a42065c8183cce100d632a'
...
* commit '3fe26bb60858951710a42065c8183cce100d632a':
hlsenc: write playlist into a temp file and replace the original atomically
Conflicts:
libavformat/hlsenc.c
See: da97e4c64a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 01:59:32 +01:00
Michael Niedermayer
e78a729163
avformat/hlsenc: Use ff_rename() only for local files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 01:50:26 +01:00
Hendrik Leppkes
da97e4c64a
hlsenc: write playlist into a temp file and replace the original atomically
...
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 01:50:06 +01:00
Michael Niedermayer
0d6ae06766
Merge commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200'
...
* commit 'ff48ae94f90f6862dbe5b1e7397a1bda3150e200':
hlsenc: remove the AVIOContext for the playlist from the muxer context
Conflicts:
libavformat/hlsenc.c
See: 28bf05e7b5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 01:07:58 +01:00
Peter Meerwald
9abc80f1ed
libavcodec: Make use of av_clip functions
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-21 00:54:40 +01:00
Peter Meerwald
76ce9bd8e2
libavutil: Add ARM av_clip_intp2_arm
...
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>
2015-02-21 00:54:40 +01:00
Peter Meerwald
bf07d813f6
libavutil: Add av_clip_intp2
...
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>
2015-02-21 00:54:40 +01:00
Michael Niedermayer
c0e3b46118
swresample: add av_cold to init functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 00:33:09 +01:00
Lukasz Marek
e19d1840da
lavf/ffmenc: do not fail on missing codec
...
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>
2015-02-21 00:23:37 +01:00
Hendrik Leppkes
3fe26bb608
hlsenc: write playlist into a temp file and replace the original atomically
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20 23:55:28 +02:00
Hendrik Leppkes
ff48ae94f9
hlsenc: remove the AVIOContext for the playlist from the muxer context
...
Its only used in one function, having it in the context serves no purpose.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20 23:55:27 +02:00
Michael Niedermayer
0a1146a59a
Merge commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b'
...
* commit 'b8d18a94376c44dac9523dc3317259a30fc92f8b':
libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 22:24:43 +01:00
Michael Niedermayer
7b7f8d3ed0
Merge commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99'
...
* commit 'df0891fc8f32db3ced797cd6ebff9492fda01b99':
libavresample: Annotate AARCH64 init function with av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 22:13:07 +01:00
Michael Niedermayer
dc6eadaa45
Merge commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'
...
* 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>
2015-02-20 22:03:54 +01:00
Michael Niedermayer
d19ca4b2ea
Merge commit 'a335ed767161c6da2815371177cfd5e40f78e5b7'
...
* commit 'a335ed767161c6da2815371177cfd5e40f78e5b7':
rtpdec_h264: Remove an unnecessary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:57:34 +01:00
Michael Niedermayer
ac7128a90f
Merge commit '176903ce833ce7469f411640e9748a0d549b5285'
...
* commit '176903ce833ce7469f411640e9748a0d549b5285':
rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:48:32 +01:00
Michael Niedermayer
48e661b30b
Merge commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'
...
* commit 'bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4':
rtpdec_h264: Make a parameter pointer const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:40:17 +01:00
Michael Niedermayer
5346b57ee7
Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'
...
* commit '7650caf013f45ebebf128855735a0c6350836ea4':
rtpdec_h264: Use av_realloc instead of av_malloc+mempcy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:30:14 +01:00
Michael Niedermayer
2130ed3312
Merge commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'
...
* commit '8bdbf49c6f4d9473183a3c45ec70d611eb6183cd':
rtpdec_h264: Include the right header for AV_RB16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:23:16 +01:00
Michael Niedermayer
de4ae9fb64
Merge commit 'ba2e07909b848e583245856a59d0fe1dd08f917e'
...
* commit 'ba2e07909b848e583245856a59d0fe1dd08f917e':
rtpdec_vp8: Set the keyframe flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:15:28 +01:00
Michael Niedermayer
0f55bc29d4
avformat/omadec: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:01:54 +01:00
Michael Niedermayer
cb08687180
avformat/vqf: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 21:00:57 +01:00
Michael Niedermayer
d44e0d8b93
avformat/wtvdec: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 20:57:31 +01:00
Michael Niedermayer
26c0cc154e
avformat/mvdec: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 20:41:35 +01:00
Michael Niedermayer
80a851aa5e
avformat/apngdec: Use 64bit for ret to avoid overflow
...
Missed this hunk in first commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 20:39:04 +01:00
Michael Niedermayer
12987f8900
avformat/gxf: Use 64bit for res to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 20:14:56 +01:00
Michael Niedermayer
d1923d15a3
avformat/idcin: Use 64bit for ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 20:13:06 +01:00
Michael Niedermayer
0e3d6e17de
avformat/apngdec: Use 64bit ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 19:31:10 +01:00
Michael Niedermayer
d4936d28a1
avformat/asfdec: Use 64bit ret to avoid overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 19:30:09 +01:00
Rodger Combs
62e95757d5
wtvdec: fix integer overflow resulting in errors with large files
...
This fixes a regression in 9fbc613f0d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 18:38:36 +01:00
Peter Meerwald
b8d18a9437
libavcodec: Don't use av_cold annotation in twinvq header file
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20 19:32:37 +02:00
Peter Meerwald
df0891fc8f
libavresample: Annotate AARCH64 init function with av_cold
...
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20 19:32:37 +02:00
Martin Storsjö
46ad9ac964
rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-20 19:30:05 +02:00
Martin Storsjö
a335ed7671
rtpdec_h264: Remove an unnecessary check
...
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>
2015-02-20 19:29:58 +02:00