OSDN Git Service
Michael Niedermayer [Sat, 21 Feb 2015 11:56:08 +0000 (12:56 +0100)]
Merge commit '
0de07510844517b615ef2a2e2916f6391ad88687'
* commit '
0de07510844517b615ef2a2e2916f6391ad88687':
rtpdec_h264: Make reusable functions non-static
Conflicts:
libavformat/rtpdec_formats.h
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Feb 2015 11:44:09 +0000 (12:44 +0100)]
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>
Michael Niedermayer [Sat, 21 Feb 2015 11:32:28 +0000 (12:32 +0100)]
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>
Michael Niedermayer [Sat, 21 Feb 2015 11:25:04 +0000 (12:25 +0100)]
Merge commit '
48183b3ad45c95e386a4cb02e1a68b53e6835ac5'
* commit '
48183b3ad45c95e386a4cb02e1a68b53e6835ac5':
rtpdec_h264: Generalize parse_sprop_parameter_sets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Feb 2015 11:07:26 +0000 (12:07 +0100)]
Merge commit '
a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'
* commit '
a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
tests: drop bc dependency
Conflicts:
tests/fate-run.sh
See:
d47eeff2741a9ad9eb4398c1d844dd4f638d6ee4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Feb 2015 10:52:29 +0000 (11:52 +0100)]
Merge commit '
a06b0b1295c51d100101e0ca0434e199ad6de6b5'
* commit '
a06b0b1295c51d100101e0ca0434e199ad6de6b5':
h264: initialize H264Context.avctx in init_thread_copy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Feb 2015 10:40:44 +0000 (11:40 +0100)]
Merge commit '
0dea4c77ccf5956561bb8991311b3d834bb5fa40'
* 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>
Michael Niedermayer [Sat, 21 Feb 2015 10:24:11 +0000 (11:24 +0100)]
Merge commit '
9abc80f1ed673141326341e26a05c3e1f78576d0'
* commit '
9abc80f1ed673141326341e26a05c3e1f78576d0':
libavcodec: Make use of av_clip functions
Conflicts:
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Feb 2015 10:15:18 +0000 (11:15 +0100)]
Merge commit '
76ce9bd8e26dcb3652240a1072840ff4011d7cdc'
* commit '
76ce9bd8e26dcb3652240a1072840ff4011d7cdc':
libavutil: Add ARM av_clip_intp2_arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Feb 2015 10:02:17 +0000 (11:02 +0100)]
Merge commit '
bf07d813f6c88b5a76980f321cf7272d799c4216'
* commit '
bf07d813f6c88b5a76980f321cf7272d799c4216':
libavutil: Add av_clip_intp2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 19 Feb 2015 20:18:55 +0000 (22:18 +0200)]
rtpdec_h264: Make reusable functions non-static
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Feb 2015 20:12:21 +0000 (22:12 +0200)]
rtpdec_h264: Fix nal type counting after refactoring
This fixes builds with -DDEBUG after
f0a874799.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Feb 2015 19:40:48 +0000 (21:40 +0200)]
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>
Martin Storsjö [Thu, 19 Feb 2015 19:19:29 +0000 (21:19 +0200)]
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>
Clément Bœsch [Mon, 19 Jan 2015 21:56:59 +0000 (22:56 +0100)]
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>
Anton Khirnov [Thu, 12 Feb 2015 12:06:49 +0000 (13:06 +0100)]
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.
Anton Khirnov [Thu, 12 Feb 2015 11:26:58 +0000 (12:26 +0100)]
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.
Christophe Gisquet [Wed, 18 Feb 2015 09:51:17 +0000 (10:51 +0100)]
Makefile: improve DBG option for asm
This improves the cleanup, dependency generation and DBG command issuing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 21 Feb 2015 00:59:15 +0000 (01:59 +0100)]
Merge commit '
3fe26bb60858951710a42065c8183cce100d632a'
* 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>
Michael Niedermayer [Sat, 21 Feb 2015 00:21:53 +0000 (01:21 +0100)]
avformat/hlsenc: Use ff_rename() only for local files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 20 Feb 2015 11:55:14 +0000 (12:55 +0100)]
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>
Michael Niedermayer [Sat, 21 Feb 2015 00:07:37 +0000 (01:07 +0100)]
Merge commit '
ff48ae94f90f6862dbe5b1e7397a1bda3150e200'
* 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>
Peter Meerwald [Fri, 20 Feb 2015 00:35:35 +0000 (01:35 +0100)]
libavcodec: Make use of av_clip functions
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Peter Meerwald [Fri, 20 Feb 2015 00:35:34 +0000 (01:35 +0100)]
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>
Peter Meerwald [Fri, 20 Feb 2015 00:35:33 +0000 (01:35 +0100)]
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>
Michael Niedermayer [Fri, 20 Feb 2015 22:55:52 +0000 (23:55 +0100)]
swresample: add av_cold to init functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Thu, 19 Feb 2015 22:50:04 +0000 (23:50 +0100)]
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>
Hendrik Leppkes [Fri, 20 Feb 2015 11:54:58 +0000 (12:54 +0100)]
hlsenc: write playlist into a temp file and replace the original atomically
Signed-off-by: Martin Storsjö <martin@martin.st>
Hendrik Leppkes [Fri, 20 Feb 2015 11:54:57 +0000 (12:54 +0100)]
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>
Michael Niedermayer [Fri, 20 Feb 2015 21:24:31 +0000 (22:24 +0100)]
Merge commit '
b8d18a94376c44dac9523dc3317259a30fc92f8b'
* commit '
b8d18a94376c44dac9523dc3317259a30fc92f8b':
libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 21:12:29 +0000 (22:12 +0100)]
Merge commit '
df0891fc8f32db3ced797cd6ebff9492fda01b99'
* commit '
df0891fc8f32db3ced797cd6ebff9492fda01b99':
libavresample: Annotate AARCH64 init function with av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 21:03:54 +0000 (22:03 +0100)]
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>
Michael Niedermayer [Fri, 20 Feb 2015 20:57:30 +0000 (21:57 +0100)]
Merge commit '
a335ed767161c6da2815371177cfd5e40f78e5b7'
* commit '
a335ed767161c6da2815371177cfd5e40f78e5b7':
rtpdec_h264: Remove an unnecessary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 20:48:14 +0000 (21:48 +0100)]
Merge commit '
176903ce833ce7469f411640e9748a0d549b5285'
* commit '
176903ce833ce7469f411640e9748a0d549b5285':
rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 20:40:07 +0000 (21:40 +0100)]
Merge commit '
bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4'
* commit '
bb8c6ac840afa69dd37860fdf85da9f4cf1e0ae4':
rtpdec_h264: Make a parameter pointer const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 20:30:01 +0000 (21:30 +0100)]
Merge commit '
7650caf013f45ebebf128855735a0c6350836ea4'
* commit '
7650caf013f45ebebf128855735a0c6350836ea4':
rtpdec_h264: Use av_realloc instead of av_malloc+mempcy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 20:23:07 +0000 (21:23 +0100)]
Merge commit '
8bdbf49c6f4d9473183a3c45ec70d611eb6183cd'
* commit '
8bdbf49c6f4d9473183a3c45ec70d611eb6183cd':
rtpdec_h264: Include the right header for AV_RB16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 20:14:53 +0000 (21:14 +0100)]
Merge commit '
ba2e07909b848e583245856a59d0fe1dd08f917e'
* commit '
ba2e07909b848e583245856a59d0fe1dd08f917e':
rtpdec_vp8: Set the keyframe flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 20:01:54 +0000 (21:01 +0100)]
avformat/omadec: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 20:00:57 +0000 (21:00 +0100)]
avformat/vqf: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 19:57:31 +0000 (20:57 +0100)]
avformat/wtvdec: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 19:41:35 +0000 (20:41 +0100)]
avformat/mvdec: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 19:38:14 +0000 (20:38 +0100)]
avformat/apngdec: Use 64bit for ret to avoid overflow
Missed this hunk in first commit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 19:14:56 +0000 (20:14 +0100)]
avformat/gxf: Use 64bit for res to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 19:13:06 +0000 (20:13 +0100)]
avformat/idcin: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 18:31:10 +0000 (19:31 +0100)]
avformat/apngdec: Use 64bit ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 18:29:12 +0000 (19:29 +0100)]
avformat/asfdec: Use 64bit ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Fri, 20 Feb 2015 15:30:04 +0000 (09:30 -0600)]
wtvdec: fix integer overflow resulting in errors with large files
This fixes a regression in
9fbc613f0df1628e7e78bca791fa8833846f8210
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Meerwald [Thu, 19 Feb 2015 22:28:28 +0000 (23:28 +0100)]
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>
Peter Meerwald [Thu, 19 Feb 2015 22:28:27 +0000 (23:28 +0100)]
libavresample: Annotate AARCH64 init function with av_cold
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Feb 2015 19:49:18 +0000 (21:49 +0200)]
rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Feb 2015 19:28:58 +0000 (21:28 +0200)]
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>
Martin Storsjö [Thu, 19 Feb 2015 19:28:01 +0000 (21:28 +0200)]
rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a
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>
Martin Storsjö [Thu, 19 Feb 2015 19:14:05 +0000 (21:14 +0200)]
rtpdec_h264: Make a parameter pointer const
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Feb 2015 19:12:06 +0000 (21:12 +0200)]
rtpdec_h264: Use av_realloc instead of av_malloc+mempcy
This is similar to what was done for rtpdec_hevc in
ced7238cd01.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Feb 2015 19:04:45 +0000 (21:04 +0200)]
rtpdec_h264: Include the right header for AV_RB16
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>
Martin Storsjö [Fri, 20 Feb 2015 14:17:44 +0000 (16:17 +0200)]
rtpdec_vp8: Set the keyframe flag
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>
Michael Niedermayer [Fri, 20 Feb 2015 15:17:46 +0000 (16:17 +0100)]
MAINTAINERS: Add Oleksij as maintainer for DSS*
Also add a 2nd maintainer at the authors request (due to lack of time)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 20 Feb 2015 11:55:13 +0000 (12:55 +0100)]
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: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley [Mon, 16 Feb 2015 10:40:36 +0000 (10:40 +0000)]
avformat/movenc: Move avid DNxHD padding to the correct spot
Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd
ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg,
when outputting DNxHD due to the incorrect padding placement. Now we add the
padding in the correct place
Tidy up FATE changes due to padding changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 10:11:33 +0000 (11:11 +0100)]
avcodec/dca: move remaining tables to dcadata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 02:19:02 +0000 (03:19 +0100)]
avcodec/snowdec: Fix avmv_index increment
Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Arwa Arif [Wed, 18 Feb 2015 19:56:44 +0000 (01:26 +0530)]
avfilter/vf_eq: Add process_command to eq.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:49:57 +0000 (22:49 +0100)]
avcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculation
Also check the combined_pitch for validity (which is needed to keep the behavior
identical in the error case)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:41:41 +0000 (22:41 +0100)]
avcodec/dss_sp: de-obfuscate index inversion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:29:02 +0000 (22:29 +0100)]
avcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside brackets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:15:22 +0000 (22:15 +0100)]
avformat/dss: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:10:47 +0000 (22:10 +0100)]
avformat/dss: Check sscanf() return value in dss_read_metadata_date()
Fixes writing uninitialized values into metadata without error in case
parsing fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:53:39 +0000 (21:53 +0100)]
Merge commit '
b727b0eeb73cd78533a7fd387ceccd505e48fa6c'
* commit '
b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
fate: Add tests for DSS
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:44:58 +0000 (21:44 +0100)]
Merge commit '
062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
* commit '
062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:31:26 +0000 (21:31 +0100)]
Merge commit '
c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
* commit '
c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:12:29 +0000 (21:12 +0100)]
Merge commit '
0fbb271318899a0fb1fbcbb3db8292e909b91e23'
* commit '
0fbb271318899a0fb1fbcbb3db8292e909b91e23':
qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:12:16 +0000 (21:12 +0100)]
Merge commit '
11c22dfd495bbd3f38df639772aa4bb9a1be882d'
* commit '
11c22dfd495bbd3f38df639772aa4bb9a1be882d':
configure: add missing h264_qsv hwaccel deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 19:52:29 +0000 (20:52 +0100)]
Merge commit '
4e08c821106fc1d6d358864abf0d8488b12f38c6'
* commit '
4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 19:39:04 +0000 (20:39 +0100)]
Merge commit '
31d2039cb42668ebcf08248bc48bbad44aa05f49'
* commit '
31d2039cb42668ebcf08248bc48bbad44aa05f49':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 19:23:48 +0000 (20:23 +0100)]
Merge commit '
5b1d9ceec715846a58fe029bc3889ed6fa62436a'
* commit '
5b1d9ceec715846a58fe029bc3889ed6fa62436a':
pixfmt: add a pixel format for QSV hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 13 Feb 2015 07:36:18 +0000 (08:36 +0100)]
fate: Add tests for DSS
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Oleksij Rempel [Fri, 13 Feb 2015 07:36:17 +0000 (08:36 +0100)]
lavf: Add DSS demuxer
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Oleksij Rempel [Fri, 13 Feb 2015 07:36:16 +0000 (08:36 +0100)]
lavc: Add DSS SP decoder
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Anton Khirnov [Thu, 19 Feb 2015 16:35:34 +0000 (17:35 +0100)]
qsv_api: fix building with libmfx disabled
Anton Khirnov [Thu, 19 Feb 2015 16:32:55 +0000 (17:32 +0100)]
configure: add missing h264_qsv hwaccel deps
Michael Niedermayer [Thu, 19 Feb 2015 15:36:48 +0000 (16:36 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
doc/faq: explain DAR/SAR preserving.
doc: set documentencoding on toplevel texi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley [Thu, 19 Feb 2015 11:08:14 +0000 (11:08 +0000)]
avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom.
On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.
Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 10 Feb 2015 09:40:59 +0000 (10:40 +0100)]
lavc: add an Intel libmfx-based H.264 decoder
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.
Anton Khirnov [Mon, 9 Feb 2015 13:41:50 +0000 (14:41 +0100)]
h264_parser: export video format and dimensions
Anton Khirnov [Sat, 7 Feb 2015 11:14:45 +0000 (12:14 +0100)]
pixfmt: add a pixel format for QSV hwaccel
Nicolas George [Mon, 9 Feb 2015 15:17:22 +0000 (16:17 +0100)]
doc/faq: explain DAR/SAR preserving.
Nicolas George [Mon, 9 Feb 2015 15:17:44 +0000 (16:17 +0100)]
doc: set documentencoding on toplevel texi files.
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
Clément Bœsch [Thu, 19 Feb 2015 10:17:43 +0000 (11:17 +0100)]
avfilter/palettegen: raise cache size from 64k to 512k
(or 32k to 256k in 32-bit)
This is similar to
a00bab347518d4824d51ec7078f1d84ca097c53b
Michael Niedermayer [Thu, 19 Feb 2015 09:51:19 +0000 (10:51 +0100)]
Merge commit '
0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'
* commit '
0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
rv40: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Himangi Saraogi [Thu, 19 Feb 2015 07:14:19 +0000 (12:44 +0530)]
rv40: Return more meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 19 Feb 2015 02:14:50 +0000 (03:14 +0100)]
avcodec/wmalosslessdec: use sizeof() instead of a literal number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 00:51:54 +0000 (01:51 +0100)]
avfilter/vf_subtitles: Add () to protect the argument of the AA() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 21:50:41 +0000 (22:50 +0100)]
avutil/sha: Protect macro arguments with ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 21:12:12 +0000 (22:12 +0100)]
ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs
Fixes: CID1270809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 19:35:06 +0000 (20:35 +0100)]
Michael Niedermayer [Wed, 18 Feb 2015 19:25:41 +0000 (20:25 +0100)]
Merge commit '
2de887e45b664f44b51686f5979fa8ce6dfe2ec2'
* commit '
2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
libx265: Reduce the scope of some variables
See:
b920db67317a31f0e8d4a010faa26dbd12b0dcdb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Supraja Meedinti [Wed, 18 Feb 2015 13:13:03 +0000 (18:43 +0530)]
tests: fate: adding fate-test for twofish
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 15:18:26 +0000 (16:18 +0100)]
avformat/movenc: Fix use of uninitialized variable (ret)
Fixed CID1270823
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:53 +0000 (17:04 -0500)]
libx265: Add crf private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>