ffmpeg.git
4 years agox86/doc/Makefile: DBG=1 to preprocess external asm
Christophe Gisquet [Sun, 8 Feb 2015 11:18:27 +0000 (12:18 +0100)]
x86/doc/Makefile: DBG=1 to preprocess external asm

The macro hell sometimes make it difficult to trace the source of
an error, so it is easier to analyze the preprocessed output.

This patch makes this automatical by specifying DBG=1 on the
command line: a file ffmpeg/dir/file.asm gets preprocessed to
builddir/dir/file.dbg.asm, which is then compiled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86inc: Correctly warn on use of SSE2 instructions in SSE functions
Christophe Gisquet [Tue, 3 Feb 2015 19:40:41 +0000 (20:40 +0100)]
x86inc: Correctly warn on use of SSE2 instructions in SSE functions

SSE2 instructions that are XMM-implementations of pre-existing MMX/MMX2
instructions did not issue warnings when used in SSE functions. Handle
it by also checking the register type when such instructions are used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro
Michael Niedermayer [Mon, 16 Feb 2015 23:49:32 +0000 (00:49 +0100)]
avfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_phase: Add () to protect DIFF()s arguments
Michael Niedermayer [Mon, 16 Feb 2015 23:47:47 +0000 (00:47 +0100)]
avfilter/vf_phase: Add () to protect DIFF()s arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/resample_template: Add () to protect the arguments of the OUT() macro
Michael Niedermayer [Mon, 16 Feb 2015 23:36:35 +0000 (00:36 +0100)]
swresample/resample_template: Add () to protect the arguments of the OUT() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/aes: Add () to protect the ROT() arguments
Michael Niedermayer [Mon, 16 Feb 2015 23:22:42 +0000 (00:22 +0100)]
avutil/aes: Add () to protect the ROT() arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments
Michael Niedermayer [Mon, 16 Feb 2015 23:21:48 +0000 (00:21 +0100)]
avutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/intmath: Add () to protect the ff_log2() argument
Michael Niedermayer [Mon, 16 Feb 2015 23:20:30 +0000 (00:20 +0100)]
avutil/intmath: Add () to protect the ff_log2() argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/murmur3: Add () to protect the ROT() arguments
Michael Niedermayer [Mon, 16 Feb 2015 23:18:01 +0000 (00:18 +0100)]
avutil/murmur3: Add () to protect the ROT() arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/version: Add () to protect the AV_VERSION_INT() arguments
Michael Niedermayer [Mon, 16 Feb 2015 23:17:21 +0000 (00:17 +0100)]
avutil/version: Add () to protect the AV_VERSION_INT() arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/tedcaptionsdec: add () to protect the argument of ERR_CODE()
Michael Niedermayer [Mon, 16 Feb 2015 23:05:51 +0000 (00:05 +0100)]
avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/log: add () to protect the argument of AV_LOG_C()
Michael Niedermayer [Mon, 16 Feb 2015 23:04:22 +0000 (00:04 +0100)]
avutil/log: add () to protect the argument of AV_LOG_C()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1dsp: add () to protect the arguments of the op* macros
Michael Niedermayer [Mon, 16 Feb 2015 23:02:40 +0000 (00:02 +0100)]
avcodec/vc1dsp: add () to protect the arguments of the op* macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ac3: add () to protect the macro arguments
Michael Niedermayer [Mon, 16 Feb 2015 22:59:39 +0000 (23:59 +0100)]
avcodec/ac3: add () to protect the macro arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpc8: Add () to protect MKMPCTAG()s arguments
Michael Niedermayer [Mon, 16 Feb 2015 22:14:27 +0000 (23:14 +0100)]
avformat/mpc8: Add () to protect MKMPCTAG()s arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/me_cmp: add () to protect avg*s arguments
Michael Niedermayer [Mon, 16 Feb 2015 22:13:00 +0000 (23:13 +0100)]
avcodec/me_cmp: add () to protect avg*s arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/bmvvideo: Add () to protect NEXT_BYTE() argument
Michael Niedermayer [Mon, 16 Feb 2015 21:56:09 +0000 (22:56 +0100)]
avcodec/bmvvideo: Add () to protect NEXT_BYTE()  argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample/swresample-test: Add () to protect uint_rand() argument
Michael Niedermayer [Mon, 16 Feb 2015 21:55:17 +0000 (22:55 +0100)]
swresample/swresample-test: Add () to protect uint_rand() argument

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/tls: add () to protect macro arguments
Michael Niedermayer [Mon, 16 Feb 2015 21:53:28 +0000 (22:53 +0100)]
avformat/tls: add () to protect macro arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevcdsp: add missing () to CMP macro
James Almer [Mon, 16 Feb 2015 21:53:38 +0000 (18:53 -0300)]
avcodec/hevcdsp: add missing () to CMP macro

Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86: hevc_mc: save 1 gpr in epel filter loading
Christophe Gisquet [Sat, 7 Feb 2015 18:49:38 +0000 (18:49 +0000)]
x86: hevc_mc: save 1 gpr in epel filter loading

The 3*stride value stored in r3src can be loaded much later,
so use r3src instead of a dedicated gpr when possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hevcdsp: optimize pixel comparison in sao_edge_filter
James Almer [Mon, 16 Feb 2015 19:53:31 +0000 (16:53 -0300)]
avcodec/hevcdsp: optimize pixel comparison in sao_edge_filter

GCC 4.9.2 on a Core i5-4200U @ 1.60GHz, Linux x86_64

Before
715487 decicycles in sao_edge_filter_8, 262144 runs, 0 skips

After
672104 decicycles in sao_edge_filter_8, 262144 runs, 0 skips

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agohls: fix a null pointer dereference
wm4 [Mon, 16 Feb 2015 18:31:42 +0000 (19:31 +0100)]
hls: fix a null pointer dereference

Not allocating the pls->ctx will crash in libavformat/hls.c:1410, where
it tries to dereference the field.

Sample: http://ec24.rtp.pt/liverepeater/rtpn.smil/playlist.m3u8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_mc: factor out helper functions for scaling blocks
zhaoxiu.zeng [Mon, 16 Feb 2015 16:38:53 +0000 (00:38 +0800)]
avcodec/vc1_mc: factor out helper functions for scaling blocks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpdec_h264: fix compile failure with -DDEBUG
Kevin Wheatley [Mon, 16 Feb 2015 17:05:28 +0000 (17:05 +0000)]
avformat/rtpdec_h264: fix compile failure with -DDEBUG

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/gif: fix off by one in column offsetting finding
Clément Bœsch [Mon, 16 Feb 2015 16:23:34 +0000 (17:23 +0100)]
avcodec/gif: fix off by one in column offsetting finding

4 years agohevcdsp: HEVC deblocking ARM NEON register clobber fix
Seppo Tomperi [Mon, 16 Feb 2015 11:13:30 +0000 (13:13 +0200)]
hevcdsp: HEVC deblocking ARM NEON register clobber fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_mc: move median4() to mathops.h
zhaoxiu.zeng [Sat, 14 Feb 2015 15:14:47 +0000 (23:14 +0800)]
avcodec/vc1_mc: move median4() to mathops.h

Needed for architecture specific optimizations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/g722dsp: add ff_g722_apply_qmf_sse2
James Almer [Mon, 16 Feb 2015 02:16:25 +0000 (23:16 -0300)]
x86/g722dsp: add ff_g722_apply_qmf_sse2

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '81ef46020fa654720e3beb4f5551ba634fae262a'
Michael Niedermayer [Mon, 16 Feb 2015 01:56:17 +0000 (02:56 +0100)]
Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'

* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
  bktr: Use av_strerror and propagate error codes

Conflicts:
libavdevice/bktr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3a651f599a18b023602370b67a77eb0efa309b20'
Michael Niedermayer [Mon, 16 Feb 2015 01:40:26 +0000 (02:40 +0100)]
Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'

* commit '3a651f599a18b023602370b67a77eb0efa309b20':
  dca: Move data tables from a header to an object file

Conflicts:
libavcodec/Makefile
libavcodec/dcadata.h
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'
Michael Niedermayer [Mon, 16 Feb 2015 01:29:41 +0000 (02:29 +0100)]
Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'

* commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda':
  dca: Add array sizes to array declarations

Conflicts:
libavcodec/dcadata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '702458538d4e52809bcef460d39baabf061b16b5'
Michael Niedermayer [Mon, 16 Feb 2015 01:16:29 +0000 (02:16 +0100)]
Merge commit '702458538d4e52809bcef460d39baabf061b16b5'

* commit '702458538d4e52809bcef460d39baabf061b16b5':
  g722: Add ARM NEON implementation for g722_apply_qmf()

Conflicts:
libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '73ae0a9d12857852222363f9a7c14d07058ebfd3'
Michael Niedermayer [Mon, 16 Feb 2015 01:07:39 +0000 (02:07 +0100)]
Merge commit '73ae0a9d12857852222363f9a7c14d07058ebfd3'

* commit '73ae0a9d12857852222363f9a7c14d07058ebfd3':
  g722: Split out computation of band->s_zero and unroll code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b16057b5fe9f02442c52388037891c2e381205fc'
Michael Niedermayer [Mon, 16 Feb 2015 01:00:49 +0000 (02:00 +0100)]
Merge commit 'b16057b5fe9f02442c52388037891c2e381205fc'

* commit 'b16057b5fe9f02442c52388037891c2e381205fc':
  g722: Unroll g722_apply_qmf()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'
Michael Niedermayer [Mon, 16 Feb 2015 00:54:14 +0000 (01:54 +0100)]
Merge commit '10f160768b824f00933f33bc69f1fae89a25dfc8'

* commit '10f160768b824f00933f33bc69f1fae89a25dfc8':
  g722: Reduce number of pointers passed to g722_apply_qmf() function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '67690683130faf37dd9d969ced15eba2a1940ade'
Michael Niedermayer [Mon, 16 Feb 2015 00:45:50 +0000 (01:45 +0100)]
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'

* commit '67690683130faf37dd9d969ced15eba2a1940ade':
  g722: Split out g722_qmf_apply() function into g722dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Bypass av_add_index_entry()
Michael Niedermayer [Mon, 16 Feb 2015 00:28:08 +0000 (01:28 +0100)]
avformat/mov: Bypass av_add_index_entry()

The new mov code uses a temporally non sorted index since 4abfa387b8234736f6e0e541951e3d5eb60eb843
and can thus no longer be filled with av_add_index_entry() which expects the index to be sorted.
Reverting 4abfa387b8234736f6e0e541951e3d5eb60eb843 and this commit would be
a alternative fix as would be various other options.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'
Michael Niedermayer [Sun, 15 Feb 2015 23:27:04 +0000 (00:27 +0100)]
Merge commit '4abfa387b8234736f6e0e541951e3d5eb60eb843'

* commit '4abfa387b8234736f6e0e541951e3d5eb60eb843':
  mov: Change DTS-based seek into CTS-based seek.

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobktr: Use av_strerror and propagate error codes
Himangi Saraogi [Tue, 10 Feb 2015 14:06:51 +0000 (19:36 +0530)]
bktr: Use av_strerror and propagate error codes

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agodca: Move data tables from a header to an object file
Diego Biurrun [Sun, 15 Feb 2015 19:03:03 +0000 (20:03 +0100)]
dca: Move data tables from a header to an object file

This allows sharing them with the DCA XLL extension w/o duplication.

4 years agodca: Add array sizes to array declarations
Diego Biurrun [Sun, 15 Feb 2015 19:03:02 +0000 (20:03 +0100)]
dca: Add array sizes to array declarations

4 years agoMerge commit '51ca3cb604a7585a7cff35d4b954794508955c19'
Michael Niedermayer [Sun, 15 Feb 2015 20:49:57 +0000 (21:49 +0100)]
Merge commit '51ca3cb604a7585a7cff35d4b954794508955c19'

* commit '51ca3cb604a7585a7cff35d4b954794508955c19':
  xcbgrab: Use the correct geometry for the region highlight

See: 0ae37e460c345a4c76e28256af56931e00c94cb5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agog722: Add ARM NEON implementation for g722_apply_qmf()
Peter Meerwald [Sun, 15 Feb 2015 11:21:25 +0000 (12:21 +0100)]
g722: Add ARM NEON implementation for g722_apply_qmf()

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agog722: Split out computation of band->s_zero and unroll code
Peter Meerwald [Sun, 15 Feb 2015 11:21:24 +0000 (12:21 +0100)]
g722: Split out computation of band->s_zero and unroll code

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agog722: Unroll g722_apply_qmf()
Peter Meerwald [Sun, 15 Feb 2015 11:21:23 +0000 (12:21 +0100)]
g722: Unroll g722_apply_qmf()

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agog722: Reduce number of pointers passed to g722_apply_qmf() function
Peter Meerwald [Sun, 15 Feb 2015 11:21:22 +0000 (12:21 +0100)]
g722: Reduce number of pointers passed to g722_apply_qmf() function

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agog722: Split out g722_qmf_apply() function into g722dsp.c
Peter Meerwald [Sun, 15 Feb 2015 11:21:21 +0000 (12:21 +0100)]
g722: Split out g722_qmf_apply() function into g722dsp.c

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'
Michael Niedermayer [Sun, 15 Feb 2015 20:41:46 +0000 (21:41 +0100)]
Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'

* commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6':
  ape: Use the proper variable type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'
Michael Niedermayer [Sun, 15 Feb 2015 20:31:13 +0000 (21:31 +0100)]
Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'

* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
  ogg: check memory allocations

Conflicts:
libavformat/oggenc.c

See: 0f629823355680802320ee7be52af7f4e1b3e0b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '53367b34e1156614e82ef7af888928f322566f88'
Michael Niedermayer [Sun, 15 Feb 2015 20:20:25 +0000 (21:20 +0100)]
Merge commit '53367b34e1156614e82ef7af888928f322566f88'

* commit '53367b34e1156614e82ef7af888928f322566f88':
  rtp: h264: Drop the asserts

Conflicts:
libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'
Michael Niedermayer [Sun, 15 Feb 2015 20:09:43 +0000 (21:09 +0100)]
Merge commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7'

* commit '3b33dfb23c5022a0cb2a7b13878e4a3492a996c7':
  rtp: h264: Move FU-A NAL parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'
Michael Niedermayer [Sun, 15 Feb 2015 20:03:43 +0000 (21:03 +0100)]
Merge commit 'f0a87479960ce000f23f2beaf474707797b4b0d0'

* commit 'f0a87479960ce000f23f2beaf474707797b4b0d0':
  rtp: h264: Move STAP-A NAL parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'
Michael Niedermayer [Sun, 15 Feb 2015 19:57:45 +0000 (20:57 +0100)]
Merge commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b'

* commit 'a9a0b8d6c14ece1b4698c6ede9227aca980f6c5b':
  rtp: h264: Move parse_sprop_parameter_sets parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'
Michael Niedermayer [Sun, 15 Feb 2015 19:49:16 +0000 (20:49 +0100)]
Merge commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c'

* commit 'b8df0b71c525e9fc9fbee790d093bae3aa62035c':
  rtp: h264: Move profile_level_id parsing to a function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'
Michael Niedermayer [Sun, 15 Feb 2015 19:42:13 +0000 (20:42 +0100)]
Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'

* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
libavdevice/xcbgrab.c

See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff'
Michael Niedermayer [Sun, 15 Feb 2015 19:38:34 +0000 (20:38 +0100)]
Merge commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff'

* commit 'c23ccaf98827cffa651cec3bfa5e57457dfc9dff':
  xcbgrab: Check for xcb-shape

Conflicts:
configure

See: 792f0f20456cc24f1f1b9ee445e50737d65e38df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomov: Change DTS-based seek into CTS-based seek.
Yusuke Nakamura [Tue, 27 Jan 2015 10:15:37 +0000 (19:15 +0900)]
mov: Change DTS-based seek into CTS-based seek.

CTS-based seek is reasonable since player requests frames in output order
not coded order.

This change fixes seek to a keyframe within consecutive keyframes.
Let's say P[0|-1] and P[1|0], here x and y inside [x|y] are PTS and DTS
respectively, and both two frames are a keyframe. If you try to seek on
PTS=0, i.e. P[0|-1], you'll get P[1|0] if the demuxer is DTS based. This
is obviously undesirable.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit 'e21d85309943a51b7808f5e01dd258b262e09148'
Michael Niedermayer [Sun, 15 Feb 2015 19:21:10 +0000 (20:21 +0100)]
Merge commit 'e21d85309943a51b7808f5e01dd258b262e09148'

* commit 'e21d85309943a51b7808f5e01dd258b262e09148':
  FATE: add a test for the SVQ1 header byte swapping

Conflicts:
tests/fate/qt.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'
Michael Niedermayer [Sun, 15 Feb 2015 19:08:21 +0000 (20:08 +0100)]
Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'

* commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e':
  changelog: mention DXVA/HEVC and AAC ELD480

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)"
Michael Niedermayer [Sun, 15 Feb 2015 18:51:05 +0000 (19:51 +0100)]
avformat/version: Bump version for "avformat/rtpdec: DV depacketizer (RFC 6469)"

Found-by: Loriker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpdec: DV depacketizer (RFC 6469)
Thomas Volkert [Sun, 15 Feb 2015 16:20:32 +0000 (17:20 +0100)]
avformat/rtpdec: DV depacketizer (RFC 6469)

Tested with live555 RTSP server

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: fix wrong indentation
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 17:58:47 +0000 (14:58 -0300)]
ffserver: fix wrong indentation

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: decouple assignment and check
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 17:54:34 +0000 (14:54 -0300)]
ffserver: decouple assignment and check

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: break too-long lines
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 17:47:54 +0000 (14:47 -0300)]
ffserver: break too-long lines

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: reorder HTTP fwd decls
Reynaldo H. Verdejo Pinochet [Sun, 15 Feb 2015 16:23:06 +0000 (13:23 -0300)]
ffserver: reorder HTTP fwd decls

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoxcbgrab: Use the correct geometry for the region highlight
Daniel Moran [Wed, 4 Feb 2015 03:57:49 +0000 (22:57 -0500)]
xcbgrab: Use the correct geometry for the region highlight

The feature is implemented using a transparent window and drawing
inside it a rectangle filling the whole window to highlight it.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoape: Use the proper variable type
Luca Barbato [Sat, 14 Feb 2015 15:15:37 +0000 (16:15 +0100)]
ape: Use the proper variable type

Avoid an unsigned underflow.

Bug-Id: 1041122
CC: libav-stable@libav.org
4 years agoogg: check memory allocations
Federico Tomassetti [Sat, 14 Feb 2015 16:14:51 +0000 (16:14 +0000)]
ogg: check memory allocations

Bug-Id: CID 1257795
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agortp: h264: Drop the asserts
Luca Barbato [Sat, 14 Feb 2015 00:45:31 +0000 (01:45 +0100)]
rtp: h264: Drop the asserts

4 years agortp: h264: Move FU-A NAL parsing to a function
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move FU-A NAL parsing to a function

4 years agortp: h264: Move STAP-A NAL parsing to a function
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move STAP-A NAL parsing to a function

4 years agortp: h264: Move parse_sprop_parameter_sets parsing to a function
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move parse_sprop_parameter_sets parsing to a function

4 years agortp: h264: Move profile_level_id parsing to a function
Luca Barbato [Fri, 13 Feb 2015 22:38:14 +0000 (23:38 +0100)]
rtp: h264: Move profile_level_id parsing to a function

4 years agoxcbgrab: Correctly make shm optional
Luca Barbato [Tue, 25 Nov 2014 22:38:43 +0000 (23:38 +0100)]
xcbgrab: Correctly make shm optional

The segment field in the struct has to be conditionally build
as well.

4 years agoxcbgrab: Check for xcb-shape
Luca Barbato [Tue, 25 Nov 2014 22:38:17 +0000 (23:38 +0100)]
xcbgrab: Check for xcb-shape

It is required.

4 years agox86/swr: make pack_8ch functions work with compilers without aligned stack
James Almer [Sun, 15 Feb 2015 16:57:02 +0000 (13:57 -0300)]
x86/swr: make pack_8ch functions work with compilers without aligned stack

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/vc1: cleanup and simplification
zhaoxiu.zeng [Sat, 14 Feb 2015 14:45:49 +0000 (22:45 +0800)]
avcodec/vc1: cleanup and simplification

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFATE: add a test for the SVQ1 header byte swapping
Anton Khirnov [Thu, 12 Feb 2015 20:00:04 +0000 (21:00 +0100)]
FATE: add a test for the SVQ1 header byte swapping

4 years agochangelog: mention DXVA/HEVC and AAC ELD480
Anton Khirnov [Thu, 12 Feb 2015 20:10:19 +0000 (21:10 +0100)]
changelog: mention DXVA/HEVC and AAC ELD480

4 years agortpdec: experimental VP9 depacketizer (draft 0)
Thomas Volkert [Sun, 15 Feb 2015 13:46:42 +0000 (14:46 +0100)]
rtpdec: experimental VP9 depacketizer (draft 0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Creating new data stream for output format context
Anshul Maheshwari [Sun, 15 Feb 2015 09:54:01 +0000 (15:24 +0530)]
ffmpeg_opt: Creating new data stream for output format context

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
if input codec Id match with expected data stream of output format context
then only new stream with same codec id is created.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dcadec: Move remaining tables to dcadata.h
Michael Niedermayer [Sun, 15 Feb 2015 10:35:40 +0000 (11:35 +0100)]
avcodec/dcadec: Move remaining tables to dcadata.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vsrc_mandelbrot: fix indention of mis-indented block
Michael Niedermayer [Sun, 15 Feb 2015 00:53:21 +0000 (01:53 +0100)]
avfilter/vsrc_mandelbrot: fix indention of mis-indented block

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: use avpriv_find_start_code() in h264_split()
Zhaoxiu Zeng [Fri, 13 Feb 2015 05:51:30 +0000 (13:51 +0800)]
avcodec/h264: use avpriv_find_start_code() in h264_split()

This also allows replacing several literal numbers by named constants
And it should be faster, the function is not speed relevant though as it is
generally only called a few times at the streams start.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/matroskaenc: add allow_raw_vfw and disable it by default
Michael Niedermayer [Sat, 14 Feb 2015 15:20:58 +0000 (16:20 +0100)]
avformat/matroskaenc: add allow_raw_vfw and disable it by default

Based on complaint by wm4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/fixed_dsp: Use av_clip_int16() instead of the non optimized av_clip_int16_c()
Michael Niedermayer [Sat, 14 Feb 2015 23:22:46 +0000 (00:22 +0100)]
avutil/fixed_dsp: Use av_clip_int16() instead of the non optimized av_clip_int16_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'
Michael Niedermayer [Sat, 14 Feb 2015 21:51:27 +0000 (22:51 +0100)]
Merge commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f'

* commit 'ecbcebde344c9eaeb8877ba2c5d32eb3af621e7f':
  vdpau: Adjust necessary #includes for vdpau_internal.h

Conflicts:
libavcodec/vdpau_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f'
Michael Niedermayer [Sat, 14 Feb 2015 21:46:31 +0000 (22:46 +0100)]
Merge commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f'

* commit '36cf8eb4489f8709b5fb1cdb87e125ef53301c2f':
  mov: Fix compilation with DEBUG enabled

See: 349a32c436d9511fe786c761cc2728f5b5efea0e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'
Michael Niedermayer [Sat, 14 Feb 2015 21:40:35 +0000 (22:40 +0100)]
Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'

* commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664':
  dca: Move all tables into dcadata.h

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'
Michael Niedermayer [Sat, 14 Feb 2015 21:31:53 +0000 (22:31 +0100)]
Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'

* commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3':
  dca: Remove trace debugging code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa'
Michael Niedermayer [Sat, 14 Feb 2015 21:25:48 +0000 (22:25 +0100)]
Merge commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa'

* commit 'a96f51f29ac4cd95650a8bcda6c3d5d87c6357fa':
  dca: Return more informative error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dcaenc: rename DCA_SUBBANDS
Michael Niedermayer [Sat, 14 Feb 2015 21:12:56 +0000 (22:12 +0100)]
avcodec/dcaenc: rename DCA_SUBBANDS

Fixes "warning: DCA_SUBBANDS redefined"

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

* commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0':
  dca: Split code for handling the EXSS extension off into a separate file

Conflicts:
libavcodec/Makefile
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'
Michael Niedermayer [Sat, 14 Feb 2015 20:27:26 +0000 (21:27 +0100)]
Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

* commit 'bf704132a51f5d838365158331d4e535e1df4c8e':
  Don't anonymously typedef structs

Conflicts:
avprobe.c
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'
Michael Niedermayer [Sat, 14 Feb 2015 20:18:17 +0000 (21:18 +0100)]
Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'

* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0':
  avcodec: Don't anonymously typedef structs

Conflicts:
libavcodec/alac.c
libavcodec/cinepak.c
libavcodec/cscd.c
libavcodec/dcadec.c
libavcodec/g723_1.c
libavcodec/gif.c
libavcodec/iff.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'
Michael Niedermayer [Sat, 14 Feb 2015 20:07:40 +0000 (21:07 +0100)]
Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
  avformat: Don't anonymously typedef structs

Conflicts:
libavformat/adtsenc.c
libavformat/aiffenc.c
libavformat/avidec.c
libavformat/gif.c
libavformat/iff.c
libavformat/img2dec.c
libavformat/jvdec.c
libavformat/matroskadec.c
libavformat/udp.c
libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: bump minor and Changelog document the new filters
Clément Bœsch [Sun, 25 Jan 2015 18:18:59 +0000 (19:18 +0100)]
avfilter: bump minor and Changelog document the new filters

4 years agoavfilter: add paletteuse filter
Clément Bœsch [Sat, 24 Jan 2015 20:38:15 +0000 (21:38 +0100)]
avfilter: add paletteuse filter

4 years agoavfilter: add palettegen filter
Clément Bœsch [Sat, 24 Jan 2015 20:37:59 +0000 (21:37 +0100)]
avfilter: add palettegen filter