Michael Niedermayer
c7e1e4c48a
Merge commit '423f5d50e499ab972f507115700c8f31ed8993e4'
...
* commit '423f5d50e499ab972f507115700c8f31ed8993e4':
mov: Fix little endian audio detection
Conflicts:
libavformat/mov.c
See: d2549ba9df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 21:46:10 +01:00
Michael Niedermayer
45f62c74dd
Merge commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0'
...
* commit 'cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0':
aacsbr: Fix type for index variable
See: a15adabdd3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 21:30:36 +01:00
Michael Niedermayer
66de11b064
Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'
...
* commit '7c60c124c8dfaebfafa2b3c11b316db549617732':
hqx: Drop unused offsets table
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 21:18:25 +01:00
Michael Niedermayer
07ca090e81
Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00'
...
* commit '4326bc364b58e97fc3d89417054a6b7610179a00':
lavf: Do not list mov-only codecs in riff tags
Conflicts:
libavformat/Makefile
libavformat/avidec.c
See: 2e0b5f5c90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 21:09:43 +01:00
Michael Niedermayer
de732a82b6
Merge commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0'
...
* commit 'cf9861dea5d42d0b5a6cf0609b9624525d96c1e0':
isom: Add X-Com Radvision FourCC
See: ac494e5a66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 20:58:43 +01:00
Michael Niedermayer
59f687b73c
Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'
...
* commit '02d76141d68e38c80f9a205a56b9af10d74f0995':
riff: Add 'tshd' FourCC for H.264
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 20:48:39 +01:00
Michael Niedermayer
182499be72
Merge commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59'
...
* commit 'c0f504e947cc0a3c73770419bf7d1af98288fc59':
libx264: Allow full-range yuv422 and yuv444 pixel formats
See: 79209f5d6c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 20:41:04 +01:00
Michael Niedermayer
6d57da9aa4
Merge commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9'
...
* commit 'c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9':
dca: Read params->pancABIT0[param_index] only if part0 is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 20:32:57 +01:00
Michael Niedermayer
1eb28479da
Merge commit '48aef27f5232794e70ecef0d347b9f65e27a9bad'
...
* commit '48aef27f5232794e70ecef0d347b9f65e27a9bad':
x86: Put COPY3_IF_LT under HAVE_6REGS
Conflicts:
libavcodec/x86/mathops.h
See: b38910c979
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 20:25:47 +01:00
Clément Bœsch
09f057170e
avfilter/vf_colormatrix: make sure the number of threads is even for yuv420p
...
Fix crash with for example:
ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -
2015-03-17 20:19:54 +01:00
Michael Niedermayer
2cfa1fdb08
Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'
...
* commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c':
isom: Add support for TSCC2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 20:05:53 +01:00
Michael Niedermayer
33a79e443b
Merge commit '91894f27dce531c13d7e1be20253877f2e1e9e66'
...
* commit '91894f27dce531c13d7e1be20253877f2e1e9e66':
configure: Disable shift operator precedence warnings with MSVC
Conflicts:
configure
See: 9e208ce6dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 19:58:02 +01:00
Michael Niedermayer
13f8bbfb70
avformat/mov: fix mis-detection of jpeg2000
...
Fixes demuxer choice for Ticket 2792
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 19:05:44 +01:00
Michael Niedermayer
6cd079a4e7
avfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int
...
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 17:13:38 +01:00
Michael Niedermayer
7363889771
avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int
...
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 17:11:42 +01:00
Michael Niedermayer
e6140e7822
avfilter/vf_field: Change enum to int, which is accessed via AVOption as int
...
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 16:52:10 +01:00
Andreas Cadhalpun
39ddda12f1
mxfenc: fix memleaks in mxf_write_footer
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 15:05:41 +01:00
Tobias Rapp
5be04f9789
doc/protocols: Fixed missing example section marker
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 15:04:22 +01:00
Vittorio Giovara
6289706b35
fate: Move tdsc to the appropriate screen capture file
2015-03-17 13:36:10 +00:00
Vittorio Giovara
423f5d50e4
mov: Fix little endian audio detection
...
Set this field to TRUE if the audio component is to operate on
little-endian data, and FALSE otherwise.
However TRUE and FALSE are not defined. Since this flag is just a boolean,
interpret all values except for 0 as little endian.
Sample-Id: 64bit_FLOAT_Little_Endian.mov
2015-03-17 13:34:23 +00:00
Vittorio Giovara
cdce9e8025
aacsbr: Fix type for index variable
...
Prevents unsigned overflow and variable truncation.
Bug-Id: CID 603186
2015-03-17 13:34:23 +00:00
Vittorio Giovara
7c60c124c8
hqx: Drop unused offsets table
...
This is a leftover from the static to dynamic vlc table conversion.
2015-03-17 13:34:23 +00:00
Carl Eugen Hoyos
4326bc364b
lavf: Do not list mov-only codecs in riff tags
...
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-03-17 13:34:22 +00:00
Paul B Mahol
cf9861dea5
isom: Add X-Com Radvision FourCC
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-03-17 13:34:22 +00:00
Vittorio Giovara
02d76141d6
riff: Add 'tshd' FourCC for H.264
2015-03-17 13:34:22 +00:00
Carl Eugen Hoyos
c0f504e947
libx264: Allow full-range yuv422 and yuv444 pixel formats
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-03-17 13:34:22 +00:00
Niels Möller
c9ed48e80e
dca: Read params->pancABIT0[param_index] only if part0 is set
...
Prevent a spurious read from uninitialized memory.
2015-03-17 12:31:07 +01:00
Luca Barbato
48aef27f52
x86: Put COPY3_IF_LT under HAVE_6REGS
...
It uses 6 registers, unbreaks building on hardened x86 system.
Bug-Id: gentoo/541930
CC: libav-stable@libav.org
2015-03-17 12:31:04 +01:00
Luca Barbato
96dd04427f
isom: Add support for TSCC2
...
As produced by Camtasia 4.
2015-03-17 12:21:23 +01:00
Diego Biurrun
91894f27dc
configure: Disable shift operator precedence warnings with MSVC
2015-03-17 11:59:31 +01:00
Michael Niedermayer
d24af7044d
avcodec/vc1_pred: Fix undefined shifts
...
Found-by: Clang -fsanitize=shift
Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17 01:51:59 +01:00
Clément Bœsch
b17620b81b
avcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWN
2015-03-17 00:05:58 +01:00
Clément Bœsch
fd682b1892
avfilter: handle error in query_formats() of a bunch of random video filters
2015-03-16 23:43:12 +01:00
Clément Bœsch
545b0dd6aa
avfilter/formats: proper error handling in ff_set_common_*() functions
2015-03-16 23:43:12 +01:00
Clément Bœsch
f861d9b2c6
avfilter/formats: proper error handling in ff_channel_layouts_ref() and ff_formats_ref()
...
Also make sure the allocation and its check are properly done.
2015-03-16 23:43:12 +01:00
Clément Bœsch
93d9ce7cec
avfilter/formats: use av_realloc_array in ADD_FORMAT()
2015-03-16 23:43:12 +01:00
Clément Bœsch
38fb183b12
avfilter/formats: remove unused COPY_INT_LIST() macro
...
This macro is unused since 247fa6c27c
.
2015-03-16 23:43:12 +01:00
Michael Niedermayer
ae65cc7ed3
Merge commit '2cb9c2fc59c9267ad2631c07c81c188058502259'
...
* commit '2cb9c2fc59c9267ad2631c07c81c188058502259':
movenc: Allow interleaving samples when writing fragmented files
Conflicts:
libavformat/movenc.c
libavformat/movenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 23:30:13 +01:00
srikanth
730f3c49e0
OpenCL uninit bug fix - clear is_compiled flag
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 22:52:19 +01:00
Michael Niedermayer
b425b81fd2
avformat/rtsp: Fix potential pointer overflow in sdp_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 22:40:36 +01:00
Michael Niedermayer
1b3b018aa4
avformat/mpegts: Fix potential pointer overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 22:37:46 +01:00
Michael Niedermayer
29db8e45fc
configure: Silence EMMS warnings in ICC
...
Real world MMX code does not put EMMS at the start and end of every function,
it would be incredibly inefficient to do that
thus do not warn about that
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 22:20:46 +01:00
Michael Niedermayer
312eb0d66f
Merge commit '50ff0c05b691524d1fd044a2f2eefb706932fc98'
...
* commit '50ff0c05b691524d1fd044a2f2eefb706932fc98':
movenc: Support writing multiple trun atoms
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:53:02 +01:00
Michael Niedermayer
1904704a48
Merge commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce'
...
* commit 'faab8f9fcb4ffeb967dc6872c0f1e9da719106ce':
configure: move cross_compile checks after the toolchain section
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:46:02 +01:00
Michael Niedermayer
b37852c7d9
Merge commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea'
...
* commit '3e1b5cbc9ab0a61c9bec08a1df1404b9da6ed7ea':
configure: handle Apple's armv7s in probe_arm_arch()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:34:14 +01:00
Michael Niedermayer
6416dce490
Merge commit 'f01c77157789b8e3a59ed2c9646faf8299e41641'
...
* commit 'f01c77157789b8e3a59ed2c9646faf8299e41641':
fate: add explicit support for the toolchain configure option
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:27:23 +01:00
Michael Niedermayer
7c9ad3c4ea
Merge commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d'
...
* commit 'a9d60c390f35f3954821bd635fd31bbb5036b29d':
doc: fate: remove outdated SSH key fingerprint
Conflicts:
doc/fate.texi
Not merged, this does not apply to our servers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 21:19:29 +01:00
Rainer Hochecker
786032cad8
hevc: avoid unnecessary calls to get_format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 20:48:14 +01:00
zhaoxiu.zeng
332776f6c5
avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()
...
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 15:40:10 +01:00
Michael Niedermayer
d79f7bf0d6
avcodec/x86/cavsdsp: remove incorrect LOCAL_ALIGN tmp
...
This is faster and simpler as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-16 14:51:51 +01:00