ffmpeg.git
4 years agoLICENSE.md: Formatting updates
Robert Xiao [Thu, 12 Feb 2015 00:38:55 +0000 (19:38 -0500)]
LICENSE.md: Formatting updates

Put filenames and configuration options in code for clarity, and fix some list formatting.

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_enc: correctly initialize chroma_intra_matrix for MPEG1/2
Michael Niedermayer [Wed, 11 Feb 2015 23:18:59 +0000 (00:18 +0100)]
avcodec/mpegvideo_enc: correctly initialize chroma_intra_matrix for MPEG1/2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_enc: Consider chroma_intra_matrix in dct_quantize_trellis_c()
Michael Niedermayer [Wed, 11 Feb 2015 22:55:30 +0000 (23:55 +0100)]
avcodec/mpegvideo_enc: Consider chroma_intra_matrix in dct_quantize_trellis_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: mjpeg trellis test
Michael Niedermayer [Wed, 11 Feb 2015 00:28:12 +0000 (01:28 +0100)]
fate: mjpeg trellis test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegenc: support trellis quantization
Michael Niedermayer [Tue, 10 Feb 2015 23:47:15 +0000 (00:47 +0100)]
avcodec/mjpegenc: support trellis quantization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo_enc: Add intra_chroma_ac_vlc_length, it will be needed for mjpeg
Michael Niedermayer [Tue, 10 Feb 2015 23:34:02 +0000 (00:34 +0100)]
avcodec/mpegvideo_enc: Add intra_chroma_ac_vlc_length, it will be needed for mjpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocmdutils: fix success path
Jean Delvare [Wed, 11 Feb 2015 13:18:27 +0000 (14:18 +0100)]
cmdutils: fix success path

Since commit 934f2d2f5c16df8aad9f401a9fd842b5d9a78b11,
cmdutils_read_file() prints a confusing message on success:

IO error: Success

This is because the error message is printed on the success path as
well. Add the missing condition so that it is only printed on error.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: add dcshift filter
Paul B Mahol [Wed, 28 Jan 2015 15:46:58 +0000 (15:46 +0000)]
avfilter: add dcshift filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/unsharp: OpenCL unsharpen filter optimization: substitute N^2 filter computa...
Alexey Titov [Tue, 10 Feb 2015 20:21:05 +0000 (12:21 -0800)]
avfilter/unsharp: OpenCL unsharpen filter optimization: substitute N^2 filter computation with 2N+C

i7-4770K luma 21% faster, chroma 18% faster A10-7850K luma 42% faster, chroma 37% faster on 1920x1080 res

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/isom: add X-Com Radvision fourcc
Paul B Mahol [Wed, 11 Feb 2015 09:46:20 +0000 (09:46 +0000)]
avformat/isom: add X-Com Radvision fourcc

Fixes bug #4303.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoChangelog: mention more ported filters
Paul B Mahol [Wed, 11 Feb 2015 09:35:23 +0000 (09:35 +0000)]
Changelog: mention more ported filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22"
Michael Niedermayer [Tue, 10 Feb 2015 21:09:29 +0000 (22:09 +0100)]
ffmpeg: Print negative times like "-00:05:01.22" instead of "00:-5:-1.-22"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegdec: Skip blocks which are outside the visible area
Michael Niedermayer [Wed, 11 Feb 2015 02:33:53 +0000 (03:33 +0100)]
avcodec/mjpegdec: Skip blocks which are outside the visible area

Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash.avi

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'
Michael Niedermayer [Wed, 11 Feb 2015 01:13:46 +0000 (02:13 +0100)]
Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78':
  lavf: move internal fields from public to internal context

Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1509c018bd5b054a2354e20021ccbac9c934d213'
Michael Niedermayer [Wed, 11 Feb 2015 00:59:14 +0000 (01:59 +0100)]
Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'

* commit '1509c018bd5b054a2354e20021ccbac9c934d213':
  mpegts: relax restrictions on matching the packet start in read_header

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'
Michael Niedermayer [Wed, 11 Feb 2015 00:43:00 +0000 (01:43 +0100)]
Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'

* commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c':
  lavf: remove unused code

Conflicts:
libavformat/seek.c
libavformat/seek.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0232ba62a28527579e34d44700b48017cc727e5f'
Michael Niedermayer [Wed, 11 Feb 2015 00:31:52 +0000 (01:31 +0100)]
Merge commit '0232ba62a28527579e34d44700b48017cc727e5f'

* commit '0232ba62a28527579e34d44700b48017cc727e5f':
  frame: clarify buf documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/ffmpeg: Document frame_drop_threshold
Michael Niedermayer [Tue, 10 Feb 2015 13:10:23 +0000 (14:10 +0100)]
doc/ffmpeg: Document frame_drop_threshold

4 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Tue, 10 Feb 2015 22:45:54 +0000 (23:45 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: factorize thread starting and stopping code into decoder
  ffplay: make eof part of videostate and signal it when opening a stream
  ffplay: update frame timer based on last updated clock time when toggling pause

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/error: list most common error code in error_entries when strerror_r() is unava...
Michael Niedermayer [Tue, 10 Feb 2015 21:51:17 +0000 (22:51 +0100)]
avutil/error: list most common error code in error_entries when strerror_r() is unavailable

Fixes Ticket4267

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests: drop bc dependency
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.

4 years agolavf: move internal fields from public to internal context
wm4 [Fri, 6 Feb 2015 13:53:40 +0000 (14:53 +0100)]
lavf: move internal fields from public to internal context

This is not an API change; the fields were explicitly declared private
before.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agompegts: relax restrictions on matching the packet start in read_header
Anton Khirnov [Wed, 4 Feb 2015 11:37:01 +0000 (12:37 +0100)]
mpegts: relax restrictions on matching the packet start in read_header

analyze() is currently called both when probing and from read_header().
It determines the packet start by looking for the sync byte, followed by
unset Transport Error Indicator and valid adaptation_field_control.

This makes sense to do when probing, but once we already know the format
is MPEG-TS, it is counterproductive to be so strict -- e.g. in some
files the TEI might be set and analyze() might get called with a smaller
buffer than the one used for probing, resulting in a failure.

4 years agoffplay: factorize thread starting and stopping code into decoder
Marton Balint [Sun, 26 Oct 2014 18:19:31 +0000 (19:19 +0100)]
ffplay: factorize thread starting and stopping code into decoder

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: make eof part of videostate and signal it when opening a stream
Marton Balint [Tue, 6 Jan 2015 00:17:56 +0000 (01:17 +0100)]
ffplay: make eof part of videostate and signal it when opening a stream

Otherwise we may not flush a decoder when a new stream is opened during an
already eof condition.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: update frame timer based on last updated clock time when toggling pause
Marton Balint [Sun, 1 Feb 2015 22:57:49 +0000 (23:57 +0100)]
ffplay: update frame timer based on last updated clock time when toggling pause

It is better than using simply video clock, because video clock may be NAN.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavfilter: Add repeatfields filter (Port of mp=softpulldown)
Paul B Mahol [Wed, 28 Jan 2015 15:13:27 +0000 (15:13 +0000)]
avfilter: Add repeatfields filter (Port of mp=softpulldown)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: camellia: remove unwanted memory loads
Supraja Meedinti [Tue, 10 Feb 2015 15:54:07 +0000 (21:24 +0530)]
libavutil: camellia: remove unwanted memory loads

lavu       CAMELLIA     size: 1048576  runs:   1024  time:   21.549 +- 0.17

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat: DNxHD in .mov, switch unspecified color_range to mpeg
Kevin Wheatley [Tue, 10 Feb 2015 11:37:00 +0000 (11:37 +0000)]
libavformat: DNxHD in .mov, switch unspecified color_range to mpeg

Avid prefers mpeg range [16-235] by default this change brings
ffmpeg into line with that. To obtain the old behaviour use
'-color_range jpeg' on the command line prior to the ouput
filename.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopixdesc: clarify AV_PIX_FMT_FLAG_ALPHA doxygen
wm4 [Tue, 10 Feb 2015 11:18:13 +0000 (12:18 +0100)]
pixdesc: clarify AV_PIX_FMT_FLAG_ALPHA doxygen

Also make clear that PAL8 can have alpha.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: check pixdescs in a different place
wm4 [Tue, 10 Feb 2015 12:27:03 +0000 (13:27 +0100)]
avutil: check pixdescs in a different place

Doing this check in avutil_version() is not appropriate. Also, this code
is by default disabled (--assert-level is by default 0). A FATE run with
defaults will never execute the checks.

Move it to the pixelutils test program. Whatever reason there was in
avutil_version() not to run this test by default, it should be fine in
this test program. This means FATE will run the test by default. (Yes,
pixelutils is not strictly the best place for it either, but it's
better.)

(pixdesc.c also has a small test program, but it's never run by FATE.)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil: move internal function out of public header
wm4 [Tue, 10 Feb 2015 12:27:02 +0000 (13:27 +0100)]
avutil: move internal function out of public header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: fix clobbered ff_get_buffer()
Paul B Mahol [Tue, 10 Feb 2015 14:20:32 +0000 (14:20 +0000)]
avcodec: fix clobbered ff_get_buffer()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agotest/fate: added mxf_opatom regression tests
Mark Reid [Tue, 10 Feb 2015 03:19:08 +0000 (19:19 -0800)]
test/fate: added mxf_opatom regression tests

Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mss4: use av_malloc_array()
Paul B Mahol [Mon, 9 Feb 2015 13:33:11 +0000 (13:33 +0000)]
avcodec/mss4: use av_malloc_array()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/huffman: check if map was allocated too
Paul B Mahol [Mon, 9 Feb 2015 13:18:24 +0000 (13:18 +0000)]
avcodec/huffman: check if map was allocated too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/hevc_parser: check for av_mallocz() failure
Paul B Mahol [Mon, 9 Feb 2015 13:14:45 +0000 (13:14 +0000)]
avcodec/hevc_parser: check for av_mallocz() failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoexamples/demuxing_decoding: abort decoding when width, height or pix_fmt change
Andreas Cadhalpun [Sat, 31 Jan 2015 19:36:07 +0000 (20:36 +0100)]
examples/demuxing_decoding: abort decoding when width, height or pix_fmt change

This is necessary, because avcodec_decode_video2 can change
width, height and/or pixel format of the AVCodecContext. Since
video_dst_data and video_dst_linesize are not updated by calling
av_image_alloc again, av_image_copy[_plane] asserts, because the
destination buffer is too small.

In this case, creating a useable rawvideo is not possible anyway, since
it has fixed width/height/pix_fmt.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/hevc_sao: make sao_band_filter work on x86_32
James Almer [Mon, 9 Feb 2015 23:38:20 +0000 (20:38 -0300)]
x86/hevc_sao: make sao_band_filter work on x86_32

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavutil/camellia: Remove redundant casts
Michael Niedermayer [Mon, 9 Feb 2015 21:45:01 +0000 (22:45 +0100)]
avutil/camellia: Remove redundant casts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/camellia: Fix indention & whitespace
Michael Niedermayer [Mon, 9 Feb 2015 21:44:14 +0000 (22:44 +0100)]
avutil/camellia: Fix indention & whitespace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: optimize camellia cipher
Supraja Meedinti [Mon, 9 Feb 2015 18:46:55 +0000 (00:16 +0530)]
libavutil: optimize camellia cipher

Before the changes :
lavu       CAMELLIA     size: 1048576  runs:   1024  time:   32.541 +- 0.044

After the changes:
lavu       CAMELLIA     size: 1048576  runs:   1024  time:   24.589 +- 0.066

Tested with crypto_bench on a Linux x86_64 OS with Intel Core i5-3210M CPU.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroska: don't complain about unknown elements
wm4 [Mon, 9 Feb 2015 19:38:58 +0000 (20:38 +0100)]
matroska: don't complain about unknown elements

Matroska is an extensible format - unknown elements must be expected. It
shouldn't complain about such elements to the user either; it'll just
generate noise. The "error_recognition & AV_EF_EXPLODE" is completely,
wrong why would it explode on valid files?

It's still useful for debugging, so the message is left in place with a
higher log level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Fix division by 0
Michael Niedermayer [Mon, 9 Feb 2015 20:14:22 +0000 (21:14 +0100)]
avformat/utils: Fix division by 0

Fixes: signal_sigsegv_14999ef_1188_cov_2888512890_SVA_CL1_E.264

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/sgienc: return meaningful error code
Paul B Mahol [Mon, 9 Feb 2015 14:05:13 +0000 (14:05 +0000)]
avcodec/sgienc: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/mov: Check dimensions before setting aspect
Michael Niedermayer [Mon, 9 Feb 2015 13:51:03 +0000 (14:51 +0100)]
avformat/mov: Check dimensions before setting aspect

Fixes division by 0
Fixes: asan_heap-uaf_143f420_728_cov_1441472032_HDV_0113.MP4

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/x86/rematrix_init: Check av_malloc* return codes, forward errors
Michael Niedermayer [Mon, 9 Feb 2015 09:12:45 +0000 (10:12 +0100)]
swresample/x86/rematrix_init: Check av_malloc* return codes, forward errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/x86/rematrix_init: Use av_mallocz_array()
Michael Niedermayer [Mon, 9 Feb 2015 09:05:30 +0000 (10:05 +0100)]
swresample/x86/rematrix_init: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vb: Check for av_mallocz() failure
Michael Niedermayer [Mon, 9 Feb 2015 08:27:16 +0000 (09:27 +0100)]
avcodec/vb: Check for av_mallocz() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/f_sendcmd: consider it an error if there are no commands
Michael Niedermayer [Thu, 15 Jan 2015 23:08:36 +0000 (00:08 +0100)]
avfilter/f_sendcmd: consider it an error if there are no commands

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/indevs: Docs for Blackmagic high bit depth video/audio
Georg Lippitsch [Sun, 18 Jan 2015 19:44:35 +0000 (20:44 +0100)]
doc/indevs: Docs for Blackmagic high bit depth video/audio

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevcdsp: ARM NEON optimized transforms
Seppo Tomperi [Thu, 5 Feb 2015 06:49:32 +0000 (06:49 +0000)]
hevcdsp: ARM NEON optimized transforms

cherry picked from commit b153f55935969c794de4640f8d34e01c58e027ae

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: hevc_mc: remove lea in EPEL_LOAD
Christophe Gisquet [Sat, 7 Feb 2015 18:49:37 +0000 (18:49 +0000)]
x86: hevc_mc: remove lea in EPEL_LOAD

The second parameter to the macro is always an immediate address,
so no lea is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: hevc_mc: fewer gpr autoloads for _v filters
Christophe Gisquet [Sat, 7 Feb 2015 18:49:36 +0000 (18:49 +0000)]
x86: hevc_mc: fewer gpr autoloads for _v filters

In that case, it's just to load my, but mx/r3src is not used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf: remove unused code
wm4 [Fri, 6 Feb 2015 13:53:39 +0000 (14:53 +0100)]
lavf: remove unused code

Nothing uses it, and it provides no public API.

Archeological finds:

Commit 101036adb9 added the API.
Commit a8dd8dc6e9 made mpegts.c use it.
Commit af8aae3fa3 disabled it by default in mpegts.c.
Commit ae2bb52cd2 removed all uses of this from mpegts.c.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoframe: clarify buf documentation
Anton Khirnov [Fri, 14 Nov 2014 10:41:15 +0000 (11:41 +0100)]
frame: clarify buf documentation

Mention explicitly that the array must be filled contiguously.

4 years agodoc/APIchanges: updated Data stream changes in APIChange
Anshul Maheshwari [Sun, 8 Feb 2015 17:07:07 +0000 (22:37 +0530)]
doc/APIchanges: updated Data stream changes in APIChange

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 8 Feb 2015 16:31:27 +0000 (17:31 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix standalone compilation of the mov muxer with --disable-optimizations.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/hqdn3d: an invalid bit depth means a bug, not invalid read data
Clément Bœsch [Sun, 8 Feb 2015 16:16:21 +0000 (17:16 +0100)]
avfilter/hqdn3d: an invalid bit depth means a bug, not invalid read data

This code looks clumsy, and an assert would probably be more welcome.

4 years agoavformat/internal: fix av_interleaved_write_frame typo reference
Clément Bœsch [Sun, 8 Feb 2015 16:09:01 +0000 (17:09 +0100)]
avformat/internal: fix av_interleaved_write_frame typo reference

4 years agoFix standalone compilation of the mov muxer with --disable-optimizations.
Carl Eugen Hoyos [Sun, 8 Feb 2015 14:48:26 +0000 (15:48 +0100)]
Fix standalone compilation of the mov muxer with --disable-optimizations.

Reported-by: Bernhard Döbler
4 years agoavfilter/dctdnoiz: fix slice_h computation
Clément Bœsch [Sun, 8 Feb 2015 13:27:51 +0000 (14:27 +0100)]
avfilter/dctdnoiz: fix slice_h computation

ceilf() can only work if the reminder of the division is not 0.

This fixes memory errors with for instance:
  ffmpeg -f lavfi -i testsrc=s=800x500 -threads 3 -vf dctdnoiz -frames:v 1 -f null -

4 years agoavformat/mxfenc: Remove unused variables
Michael Niedermayer [Sun, 8 Feb 2015 11:38:14 +0000 (12:38 +0100)]
avformat/mxfenc: Remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi/subtitles: add force_style option
Eejya Singh [Wed, 28 Jan 2015 12:11:42 +0000 (17:41 +0530)]
lavfi/subtitles: add force_style option

Signed-off-by: Eejya Singh <singh.eejya@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
4 years agoavdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__
Michael Niedermayer [Sun, 8 Feb 2015 03:46:50 +0000 (04:46 +0100)]
avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/vp9dsp: fix clobbering of xmm6 on IDCT sse2 functions
James Almer [Sun, 8 Feb 2015 01:30:04 +0000 (22:30 -0300)]
x86/vp9dsp: fix clobbering of xmm6 on IDCT sse2 functions

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavdevice/decklink_common: Fix Decklink for Mac
Georg Lippitsch [Sun, 11 Jan 2015 14:38:46 +0000 (15:38 +0100)]
avdevice/decklink_common: Fix Decklink for Mac

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/decklink: 10 Bit support for Decklink input device
Georg Lippitsch [Sun, 18 Jan 2015 19:44:33 +0000 (20:44 +0100)]
avdevice/decklink: 10 Bit support for Decklink input device

Example to capture video clip at 1080i50 10 bit:
ffmpeg -bm_v210 1 -f decklink -i 'UltraStudio Mini Recorder@11' -acodec copy -vcodec copy output.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/mxfenc.c: added mxf opatom muxer
Mark Reid [Thu, 29 Jan 2015 03:44:21 +0000 (19:44 -0800)]
libavformat/mxfenc.c: added mxf opatom muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 8 Feb 2015 01:36:19 +0000 (02:36 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support decoding yuv dpx images.
  Do not use -mdynamic-no-pic on OSX x86_64.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame()
Michael Niedermayer [Sun, 8 Feb 2015 01:03:39 +0000 (02:03 +0100)]
avcodec/utils: Assert that dst->progress is clear before ff_thread_ref_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Setup decoder to have matching reference to the EC code
Michael Niedermayer [Sun, 8 Feb 2015 00:59:16 +0000 (01:59 +0100)]
avcodec/h264: Setup decoder to have matching reference to the EC code

Also move EC ref initialization to where the EC code is called.
Fixes out of array read
Fixes: asan_heap-uaf_143f420_142_20110805_112659_ch0.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other parts of...
Michael Niedermayer [Sun, 8 Feb 2015 01:13:48 +0000 (02:13 +0100)]
avcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other parts of the h264 decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoSupport decoding yuv dpx images.
Carl Eugen Hoyos [Sat, 7 Feb 2015 23:12:46 +0000 (00:12 +0100)]
Support decoding yuv dpx images.

4 years agoDo not use -mdynamic-no-pic on OSX x86_64.
Carl Eugen Hoyos [Sat, 7 Feb 2015 23:11:13 +0000 (00:11 +0100)]
Do not use -mdynamic-no-pic on OSX x86_64.

Fixes default compilation with icc.

4 years agoavformat/omadec: Subtract headersize in timestamp calculation
Michael Niedermayer [Sat, 7 Feb 2015 20:16:20 +0000 (21:16 +0100)]
avformat/omadec: Subtract headersize in timestamp calculation

Fixes pts/dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/omadec: only compute timestamps based on bitrate if its set
Michael Niedermayer [Sat, 7 Feb 2015 20:12:56 +0000 (21:12 +0100)]
avformat/omadec: only compute timestamps based on bitrate if its set

Fixes division by zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'
Michael Niedermayer [Sat, 7 Feb 2015 20:00:19 +0000 (21:00 +0100)]
Merge commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1'

* commit 'e352520e3ed7f08f19e63cd60e95da6bb6f037c1':
  oma: Report a timestamp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8029af586fd5a5f2a0803001f9eff386e5545fe2'
Michael Niedermayer [Sat, 7 Feb 2015 19:53:30 +0000 (20:53 +0100)]
Merge commit '8029af586fd5a5f2a0803001f9eff386e5545fe2'

* commit '8029af586fd5a5f2a0803001f9eff386e5545fe2':
  dxva2_hevc: properly fill the scaling list structure

See: b11994593ae4c3856db735800f24d38293838759
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: lavc/hevc_mc: fix comments
Christophe Gisquet [Sat, 7 Feb 2015 12:19:58 +0000 (13:19 +0100)]
x86: lavc/hevc_mc: fix comments

The width parameter is now completely at the back, and actually
never used. This helps understanding the actual parameter list.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/faxcompr: use init_get_bits8()
Paul B Mahol [Sat, 7 Feb 2015 17:16:14 +0000 (17:16 +0000)]
avcodec/faxcompr: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agohevc/sao: do in-place band filtering when possible
Christophe Gisquet [Tue, 3 Feb 2015 13:06:39 +0000 (14:06 +0100)]
hevc/sao: do in-place band filtering when possible

The copies are only needed when data must be restored, so skip them
when it must not be.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: lavc: share more constant through defines
Christophe Gisquet [Wed, 4 Feb 2015 10:41:45 +0000 (11:41 +0100)]
x86: lavc: share more constant through defines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mlv: Only add streams that are supposed to contain frames.
Carl Eugen Hoyos [Sat, 7 Feb 2015 15:18:02 +0000 (16:18 +0100)]
lavf/mlv: Only add streams that are supposed to contain frames.

Fixes ticket #4296.

Reviewed-by: Peter Ross
4 years agoavcodec/twinvqdec: use init_get_bits8()
Paul B Mahol [Sat, 7 Feb 2015 14:26:54 +0000 (14:26 +0000)]
avcodec/twinvqdec: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agooma: Report a timestamp
Luca Barbato [Thu, 29 Jan 2015 00:17:43 +0000 (01:17 +0100)]
oma: Report a timestamp

Reported-By: jb@videolan.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavc/lossless_audiodsp: revert various commits
Christophe Gisquet [Sat, 7 Feb 2015 09:20:10 +0000 (09:20 +0000)]
lavc/lossless_audiodsp: revert various commits

Their intent was to make the DSP work with wmalossless pro.
The later was fixed to work with the DSP.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agowmalossless: reset lms_update
Christophe Gisquet [Sat, 7 Feb 2015 09:20:09 +0000 (09:20 +0000)]
wmalossless: reset lms_update

It may contain garbage at the end, and zeroing allows using DSP
with longer loops.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2_hevc: properly fill the scaling list structure
Hendrik Leppkes [Tue, 3 Feb 2015 21:39:45 +0000 (22:39 +0100)]
dxva2_hevc: properly fill the scaling list structure

The scaling list can be specified in either the SPS or PPS.
Additionally, compensate for the diagonal scan permutation applied
in the decoder.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agopixdesc: Include more functions in FF_DISABLE_DEPRECATION_WARNINGS
Timothy Gu [Sat, 7 Feb 2015 04:16:10 +0000 (20:16 -0800)]
pixdesc: Include more functions in FF_DISABLE_DEPRECATION_WARNINGS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify meaning of the A/X bit in RGB555 / remove wording about signif...
Michael Niedermayer [Sat, 7 Feb 2015 12:46:04 +0000 (13:46 +0100)]
avutil/pixfmt: Clarify meaning of the A/X bit in RGB555 / remove wording about significant bit

Found-by:wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify the meaning of the alpha bits in rgb444 and similar formats
Michael Niedermayer [Fri, 6 Feb 2015 19:57:00 +0000 (20:57 +0100)]
avutil/pixfmt: Clarify the meaning of the alpha bits in rgb444 and similar formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify the meaning of the "alpha" bit in rgb555/bgr555
Michael Niedermayer [Fri, 6 Feb 2015 19:56:08 +0000 (20:56 +0100)]
avutil/pixfmt: Clarify the meaning of the "alpha" bit in rgb555/bgr555

Found-by: wm4
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/pixfmt: Clarify the meaning of the alpha byte in RGB0 and similar formats
Michael Niedermayer [Fri, 6 Feb 2015 19:54:11 +0000 (20:54 +0100)]
avutil/pixfmt: Clarify the meaning of the alpha byte in RGB0 and similar formats

Found-by: wm4
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ccaption_dec: Added Debug logs
Anshul Maheshwari [Fri, 6 Feb 2015 14:42:40 +0000 (20:12 +0530)]
avcodec/ccaption_dec: Added Debug logs

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ccaption_dec: handle error from ass_sub api
Anshul Maheshwari [Fri, 6 Feb 2015 14:42:13 +0000 (20:12 +0530)]
avcodec/ccaption_dec: handle error from ass_sub api

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ccaption_dec: Added Roll up functionality
Anshul Maheshwari [Fri, 6 Feb 2015 14:40:11 +0000 (20:10 +0530)]
avcodec/ccaption_dec: Added Roll up functionality

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'
Michael Niedermayer [Sat, 7 Feb 2015 03:54:32 +0000 (04:54 +0100)]
Merge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'

* commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6':
  fate: Add a test for AAC ELD480.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: assert that reinit does not occur after the first slice
Michael Niedermayer [Sat, 7 Feb 2015 02:45:14 +0000 (03:45 +0100)]
avcodec/h264_slice: assert that reinit does not occur after the first slice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264_slice: ignore SAR changes in slices after the first
Michael Niedermayer [Sat, 7 Feb 2015 02:34:48 +0000 (03:34 +0100)]
avcodec/h264_slice: ignore SAR changes in slices after the first

Fixes race condition and null pointer dereference
Fixes: signal_sigsegv_1472ac3_468_cov_2915641226_CABACI3_Sony_B.jsv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>