ffmpeg.git
4 years agoMerge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'
Michael Niedermayer [Wed, 22 Jul 2015 14:30:29 +0000 (16:30 +0200)]
Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'

* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
  checkasm: Always link statically

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoSupport the Hap chunked frame format
Tom Butterworth [Tue, 21 Jul 2015 00:12:12 +0000 (01:12 +0100)]
Support the Hap chunked frame format

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/asfdec_f: Parse ECC byte according to spec
Michael Niedermayer [Wed, 22 Jul 2015 11:49:31 +0000 (13:49 +0200)]
avformat/asfdec_f: Parse ECC byte according to spec

This should not change anything as the spec requires specific values
for the fields, which where handled previously.

Ask for samples when these values do not match

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: loongson optimize pixblockdsp with mmi
周晓勇 [Wed, 22 Jul 2015 07:10:38 +0000 (15:10 +0800)]
avcodec: loongson optimize pixblockdsp with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoCosmetics: Reindent after last commit.
Carl Eugen Hoyos [Wed, 22 Jul 2015 08:25:10 +0000 (10:25 +0200)]
Cosmetics: Reindent after last commit.

4 years agolavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.
Carl Eugen Hoyos [Wed, 22 Jul 2015 08:23:18 +0000 (10:23 +0200)]
lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.

4 years agomovtextenc.c: Add support for text highlighting
Niklesh [Mon, 20 Jul 2015 18:32:31 +0000 (00:02 +0530)]
movtextenc.c: Add support for text highlighting

This patch takes care of the secondary color changes in ASS through highlight and hilightcolor boxes.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agomovtextenc.c: Reorganize the code for easier maintenance
Niklesh [Mon, 20 Jul 2015 18:27:28 +0000 (23:57 +0530)]
movtextenc.c: Reorganize the code for easier maintenance

This patch reorganizes the code to make it easier to add support for different text modifier boxes and other styles in the future.

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agoavformat/asfdec_f: Improve packet resync heuristic
Michael Niedermayer [Tue, 21 Jul 2015 22:30:20 +0000 (00:30 +0200)]
avformat/asfdec_f: Improve packet resync heuristic

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/asfdec_f: Do not print errors if packets do not start with ECC
Michael Niedermayer [Tue, 21 Jul 2015 23:09:14 +0000 (01:09 +0200)]
avformat/asfdec_f: Do not print errors if packets do not start with ECC

There is nothing wrong with such packets, the spec allows this

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/asfdec_f: Increase the amount of information provided in cases of errors
Michael Niedermayer [Tue, 21 Jul 2015 22:33:30 +0000 (00:33 +0200)]
avformat/asfdec_f: Increase the amount of information provided in cases of errors

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocheckasm: Always link statically
Luca Barbato [Tue, 21 Jul 2015 21:22:42 +0000 (23:22 +0200)]
checkasm: Always link statically

Checkasm needs to use internal symbols that should not be made public.

4 years agoAdd support for TEA (Tiny Encryption Algorithm)
Vesselin Bontchev [Sun, 19 Jul 2015 20:25:53 +0000 (22:25 +0200)]
Add support for TEA (Tiny Encryption Algorithm)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/async: rename async_interrupt_callback to async_check_interrupt
Zhang Rui [Tue, 21 Jul 2015 18:47:24 +0000 (02:47 +0800)]
avformat/async: rename async_interrupt_callback to async_check_interrupt

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/async: fix interrupt_callback usage and return code
Zhang Rui [Tue, 21 Jul 2015 18:47:23 +0000 (02:47 +0800)]
avformat/async: fix interrupt_callback usage and return code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'
Michael Niedermayer [Tue, 21 Jul 2015 18:35:51 +0000 (20:35 +0200)]
Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'

* commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc':
  dds: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'
Michael Niedermayer [Tue, 21 Jul 2015 18:20:25 +0000 (20:20 +0200)]
Merge commit '977105407cae55876041dddbf4ce0934cdd4cd6c'

* commit '977105407cae55876041dddbf4ce0934cdd4cd6c':
  hap: Decode using optimal slices sizes

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavfilter/vf_crop: implement process_command
Bernd Bleßmann [Tue, 21 Jul 2015 10:48:33 +0000 (12:48 +0200)]
libavfilter/vf_crop: implement process_command

Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavfilter/vf_scale: implement process_command
Bernd Bleßmann [Tue, 21 Jul 2015 10:45:43 +0000 (12:45 +0200)]
libavfilter/vf_scale: implement process_command

Signed-off-by: Bernd Bleßmann <bb@it-entwicklung.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/utils: silence some deprecation warnings
James Almer [Tue, 21 Jul 2015 03:40:09 +0000 (00:40 -0300)]
avcodec/utils: silence some deprecation warnings

And prevent eventual compilation failures once the relevant functions
and fields are removed.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/options-test: don't alloc avctx->coded_frame
James Almer [Tue, 21 Jul 2015 03:28:57 +0000 (00:28 -0300)]
avcodec/options-test: don't alloc avctx->coded_frame

It's done automatically by avcodec_open2() now.
Fixes memleaks in fate-libavcodec-options.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec: loongson optimize blockdsp with mmi
周晓勇 [Tue, 21 Jul 2015 13:29:11 +0000 (21:29 +0800)]
avcodec: loongson optimize blockdsp with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format()
Michael Niedermayer [Tue, 21 Jul 2015 15:40:38 +0000 (17:40 +0200)]
avfilter/af_channelmap: Move ff_add_channel_layout() call to querry_format()

Avoids memleak if querry_formats is not called

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/async: Add missing else
Michael Niedermayer [Tue, 21 Jul 2015 15:04:11 +0000 (17:04 +0200)]
avformat/async: Add missing else

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'
Michael Niedermayer [Tue, 21 Jul 2015 14:55:39 +0000 (16:55 +0200)]
Merge commit '219b39a71a5694b1c14a07b86477f665a5b6849b'

* commit '219b39a71a5694b1c14a07b86477f665a5b6849b':
  parseutil: Use non ambiguous aliases for uhd

Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agotests/checkasm/Makefile: Fix checkasm with SDL
Michael Niedermayer [Tue, 21 Jul 2015 13:55:05 +0000 (15:55 +0200)]
tests/checkasm/Makefile: Fix checkasm with SDL

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agofate: add test for async protocol
Zhang Rui [Tue, 21 Jul 2015 13:04:03 +0000 (21:04 +0800)]
fate: add test for async protocol

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/hapdec: log reason for failure when texture type doesn't match stream
Tom Butterworth [Tue, 21 Jul 2015 00:12:11 +0000 (01:12 +0100)]
avcodec/hapdec: log reason for failure when texture type doesn't match stream

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: loongson optimize xvid idct with mmi
周晓勇 [Tue, 21 Jul 2015 05:54:55 +0000 (13:54 +0800)]
avcodec: loongson optimize xvid idct with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: loongson move simple idct functions to a separate file
周晓勇 [Tue, 21 Jul 2015 05:53:44 +0000 (13:53 +0800)]
avcodec: loongson move simple idct functions to a separate file

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoaacenc: move the generation of ff_aac_pow34sf_tab[]
Rostislav Pehlivanov [Fri, 17 Jul 2015 21:20:14 +0000 (22:20 +0100)]
aacenc: move the generation of ff_aac_pow34sf_tab[]

This commit moves the generation of ff_aac_pow34sf_tab[] out of the
encoder and into the table generator. The original commit log for
this table in 2011 actually mentions that it should be moved outside
but this never happened.

This is the first commit which cleans up the encoder a little.

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodds: Decode using optimal slices sizes
Luca Barbato [Fri, 17 Jul 2015 01:07:08 +0000 (03:07 +0200)]
dds: Decode using optimal slices sizes

Enjoy some cache locality and use less threads.
About the same speedup provided to HAP.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agohap: Decode using optimal slices sizes
Luca Barbato [Fri, 17 Jul 2015 01:07:07 +0000 (03:07 +0200)]
hap: Decode using optimal slices sizes

Enjoy some cache locality and use less threads.
About 5x speedup (from 60ms to 12ms to decode a 4k frame).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoparseutil: Use non ambiguous aliases for uhd
Luca Barbato [Mon, 20 Jul 2015 14:50:43 +0000 (16:50 +0200)]
parseutil: Use non ambiguous aliases for uhd

uhd1 and uhd2 would be ambigous.

4 years agoMAINTAINERS: add myself as a maintainer for async protocol
Zhang Rui [Tue, 21 Jul 2015 07:46:02 +0000 (15:46 +0800)]
MAINTAINERS: add myself as a maintainer for async protocol

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/hapdec: don't log texture format every frame, do it once per decode session
Tom Butterworth [Tue, 21 Jul 2015 00:12:10 +0000 (01:12 +0100)]
avcodec/hapdec: don't log texture format every frame, do it once per decode session

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/hap: remove unused struct member
Tom Butterworth [Tue, 21 Jul 2015 00:12:09 +0000 (01:12 +0100)]
libavcodec/hap: remove unused struct member

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/hap: Name enums
Tom Butterworth [Tue, 21 Jul 2015 00:12:09 +0000 (01:12 +0100)]
libavcodec/hap: Name enums

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aacsbr: fix compilation with hardcoded tables
James Almer [Mon, 20 Jul 2015 19:48:07 +0000 (16:48 -0300)]
avcodec/aacsbr: fix compilation with hardcoded tables

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069'
Michael Niedermayer [Mon, 20 Jul 2015 23:47:51 +0000 (01:47 +0200)]
Merge commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069'

* commit '9ed6f9a17cc1f7d3699a1223783dadc1ee222069':
  arm: use a local label instead of the function symbol in ff_prefetch_arm

See: cab6302534962331753fb69c674df86a458b098d
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'
Michael Niedermayer [Mon, 20 Jul 2015 23:39:30 +0000 (01:39 +0200)]
Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'

* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
  h264: aarch64: intra prediction optimisations

Conflicts:
libavcodec/h264pred.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
Michael Niedermayer [Mon, 20 Jul 2015 23:12:59 +0000 (01:12 +0200)]
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'

* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
  Deprecate avctx.coded_frame

Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/utils: Do not merge side data for encoders
Michael Niedermayer [Mon, 20 Jul 2015 22:46:55 +0000 (00:46 +0200)]
avcodec/utils: Do not merge side data for encoders

With side data now being added to every MPEG*/H26* video encoder
in the form of a quality scalar, software which simply stores
the pkt->data to get an ES stream would break.
This also as a side-effect makes the code faster

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'
Michael Niedermayer [Mon, 20 Jul 2015 22:54:42 +0000 (00:54 +0200)]
Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'

* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
  Add a quality factor packet side data

Conflicts:
doc/APIchanges
ffmpeg.c
libavcodec/avcodec.h
libavcodec/mpegvideo_enc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'
Michael Niedermayer [Mon, 20 Jul 2015 20:59:45 +0000 (22:59 +0200)]
Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'

* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534':
  Gather all coded_frame allocations and free functions to a single place

Conflicts:
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/dvenc.c
libavcodec/gif.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libopenjpegenc.c
libavcodec/libtheoraenc.c
libavcodec/libvpxenc.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/v210enc.c
libavcodec/v410enc.c
libavcodec/xbmenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoarm: use a local label instead of the function symbol in ff_prefetch_arm
Janne Grunau [Mon, 20 Jul 2015 08:46:15 +0000 (10:46 +0200)]
arm: use a local label instead of the function symbol in ff_prefetch_arm

Avoids a relocation which might end out of range for thumb2.

Reported-By: Ludovic Fauvet <etix@videolan.org>
Bug-Id: https://bugs.webkit.org/show_bug.cgi?id=137022
CC: libav-stable@libav.org
4 years agoh264: aarch64: intra prediction optimisations
Janne Grunau [Sun, 12 Jul 2015 16:30:09 +0000 (18:30 +0200)]
h264: aarch64: intra prediction optimisations

4 years agoMerge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'
Michael Niedermayer [Mon, 20 Jul 2015 20:36:18 +0000 (22:36 +0200)]
Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'

* commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf':
  flashsvenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'
Michael Niedermayer [Mon, 20 Jul 2015 20:35:38 +0000 (22:35 +0200)]
Merge commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b'

* commit '75c1ed2e4c7250f5e75a11d0140727054ff0136b':
  ffv1enc: Use input frame to set SAR and interlacing

Conflicts:
libavcodec/ffv1enc.c

No change as the removed coded_frame uses where not in the code anymore

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'
Michael Niedermayer [Mon, 20 Jul 2015 20:25:53 +0000 (22:25 +0200)]
Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'

* commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e':
  ffv1enc: Keep coded_frame.key_frame a write-only variable

Conflicts:
libavcodec/ffv1.h
libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'
Michael Niedermayer [Mon, 20 Jul 2015 20:14:29 +0000 (22:14 +0200)]
Merge commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162'

* commit 'efc618aff9d68d2ddc323a5c5f892ac71951f162':
  qtrleenc: Keep coded_frame.key_frame a write-only variable

Conflicts:
libavcodec/qtrleenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'
Michael Niedermayer [Mon, 20 Jul 2015 20:13:29 +0000 (22:13 +0200)]
Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'

* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
  libtheoraenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'
Michael Niedermayer [Mon, 20 Jul 2015 20:05:27 +0000 (22:05 +0200)]
Merge commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b'

* commit 'd6006dd9f0d4d01023359230212f1f9fa4800e5b':
  libvpxenc: Do not entangle coded_frame

Conflicts:
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'
Michael Niedermayer [Mon, 20 Jul 2015 20:01:41 +0000 (22:01 +0200)]
Merge commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e'

* commit '7fc8d8a1b3da1666176b3d92e989ee74f3ef014e':
  libxvid: Do not entangle coded_frame

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'
Michael Niedermayer [Mon, 20 Jul 2015 19:53:09 +0000 (21:53 +0200)]
Merge commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919'

* commit '56672aeaee19216d2fd8eeb9964b1f71f0af2919':
  svq1enc: Do not entangle coded_frame

Conflicts:
libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
Michael Niedermayer [Mon, 20 Jul 2015 19:44:53 +0000 (21:44 +0200)]
Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'

* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
  proresenc: Do not entangle coded_frame

Conflicts:
libavcodec/proresenc_kostya.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '91767360d86ac786571593ab11c7291010ab3829'
Michael Niedermayer [Mon, 20 Jul 2015 19:40:34 +0000 (21:40 +0200)]
Merge commit '91767360d86ac786571593ab11c7291010ab3829'

* commit '91767360d86ac786571593ab11c7291010ab3829':
  a64multienc: Do not entangle coded_frame

Conflicts:
libavcodec/a64multienc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'
Michael Niedermayer [Mon, 20 Jul 2015 19:31:42 +0000 (21:31 +0200)]
Merge commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e'

* commit '95e2317ed85502dd8d96bcd9b12084dbfb8f9e8e':
  roqvideoenc: Drop unneeded initialization

Conflicts:
libavcodec/roqvideoenc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'
Michael Niedermayer [Mon, 20 Jul 2015 19:20:46 +0000 (21:20 +0200)]
Merge commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4'

* commit '1f171de8cae9d0c527c5f0bae2a597dbd65fd3a4':
  mpegvideo_enc: Drop unnneded initialization

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call
Ivan Uskov [Mon, 20 Jul 2015 13:48:29 +0000 (09:48 -0400)]
libavcodec/qsvdec.c: missed MFXVideoDECODE_Close() call

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: check for erf() and copysign()
James Almer [Mon, 20 Jul 2015 07:04:46 +0000 (04:04 -0300)]
configure: check for erf() and copysign()

They are not available on some compilers.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/vf_ssim: add ff_ssim_4x4_line_xop
James Almer [Mon, 20 Jul 2015 03:50:52 +0000 (00:50 -0300)]
x86/vf_ssim: add ff_ssim_4x4_line_xop

~20% faster than ssse3. Also enabled for x86_32

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/vf_ssim: fix some instruction comments
James Almer [Mon, 20 Jul 2015 03:50:10 +0000 (00:50 -0300)]
x86/vf_ssim: fix some instruction comments

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoAdding myself as maintainer for qsv*
Ivan Uskov [Fri, 17 Jul 2015 08:38:57 +0000 (04:38 -0400)]
Adding myself as maintainer for qsv*

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/arm/intmath: return int for uint8 / uint16 clip
Michael Niedermayer [Mon, 20 Jul 2015 15:16:20 +0000 (17:16 +0200)]
avutil/arm/intmath: return int for uint8 / uint16 clip

The C functions return uint8/16_t but that is effectively int not unsigned int
Fixes fate-filter-tblend

We do not return uint8/16_t as that would require the compiler to truncate the
values, slowing it down.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Implementation of AAC_fixed_decoder (SBR-module)
Djordje Pesut [Mon, 20 Jul 2015 11:36:17 +0000 (13:36 +0200)]
avcodec: Implementation of AAC_fixed_decoder (SBR-module)

Add fixed poind code.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Table creation for AAC_fixed_decoder (SBR-module)
Jovan Zelincevic [Mon, 20 Jul 2015 11:36:16 +0000 (13:36 +0200)]
avcodec: Table creation for AAC_fixed_decoder (SBR-module)

Create tables for fixed point code.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Template creation for AAC decoder (SBR-module)
Djordje Pesut [Mon, 20 Jul 2015 11:36:15 +0000 (13:36 +0200)]
avcodec: Template creation for AAC decoder (SBR-module)

Move the existing code to a new template file.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomovtextdec.c: Correct the highlight tags
Niklesh [Fri, 17 Jul 2015 10:33:09 +0000 (16:03 +0530)]
movtextdec.c: Correct the highlight tags

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
4 years agoDeprecate avctx.coded_frame
Vittorio Giovara [Wed, 15 Jul 2015 17:41:22 +0000 (18:41 +0100)]
Deprecate avctx.coded_frame

The rationale is that coded_frame was only used to communicate key_frame,
pict_type and quality to the caller, as well as a few other random fields,
in a non predictable, let alone consistent way.

There was agreement that there was no use case for coded_frame, as it is
a full-sized AVFrame container used for just 2-3 int-sized properties,
which shouldn't even belong into the AVCodecContext in the first place.

The appropriate AVPacket flag can be used instead of key_frame, while
quality is exported with the new AVPacketSideData quality factor.
There is no replacement for the other fields as they were unreliable,
mishandled or just not used at all.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoAdd a quality factor packet side data
Vittorio Giovara [Wed, 15 Jul 2015 17:41:21 +0000 (18:41 +0100)]
Add a quality factor packet side data

This is necessary to preserve the quality information currently exported
with coded_frame. Add the new side data to every encoder that needs it,
and use it in avconv.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoavcodec/apngdec: Fix typos in decoder causing incorrect results
Donny Yang [Sun, 19 Jul 2015 20:20:56 +0000 (20:20 +0000)]
avcodec/apngdec: Fix typos in decoder causing incorrect results

Signed-off-by: Donny Yang <work@kota.moe>
4 years agoGather all coded_frame allocations and free functions to a single place
Vittorio Giovara [Wed, 15 Jul 2015 17:41:20 +0000 (18:41 +0100)]
Gather all coded_frame allocations and free functions to a single place

Allocating coded_frame is what most encoders do anyway, so it makes
sense to always allocate and free it in a single place. Moreover a lot
of encoders freed the frame with av_freep() instead of the correct API
av_frame_free().

This bring uniformity to encoder behaviour and prevents applications
from erroneusly accessing this field when not allocated. Additionally
this helps isolating encoders that export information with coded_frame,
and heavily simplifies its deprecation.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoflashsvenc: Keep coded_frame.key_frame a write-only variable
Vittorio Giovara [Wed, 15 Jul 2015 17:41:19 +0000 (18:41 +0100)]
flashsvenc: Keep coded_frame.key_frame a write-only variable

4 years agoffv1enc: Use input frame to set SAR and interlacing
Vittorio Giovara [Wed, 15 Jul 2015 17:41:18 +0000 (18:41 +0100)]
ffv1enc: Use input frame to set SAR and interlacing

4 years agoffv1enc: Keep coded_frame.key_frame a write-only variable
Vittorio Giovara [Wed, 15 Jul 2015 17:41:17 +0000 (18:41 +0100)]
ffv1enc: Keep coded_frame.key_frame a write-only variable

4 years agoqtrleenc: Keep coded_frame.key_frame a write-only variable
Vittorio Giovara [Wed, 15 Jul 2015 17:41:16 +0000 (18:41 +0100)]
qtrleenc: Keep coded_frame.key_frame a write-only variable

4 years agolibtheoraenc: Keep coded_frame.key_frame a write-only variable
Vittorio Giovara [Wed, 15 Jul 2015 17:41:15 +0000 (18:41 +0100)]
libtheoraenc: Keep coded_frame.key_frame a write-only variable

4 years agolibvpxenc: Do not entangle coded_frame
Vittorio Giovara [Wed, 15 Jul 2015 17:41:14 +0000 (18:41 +0100)]
libvpxenc: Do not entangle coded_frame

Keep coded_frame.key_frame a write-only variable.

4 years agolibxvid: Do not entangle coded_frame
Vittorio Giovara [Wed, 15 Jul 2015 17:41:13 +0000 (18:41 +0100)]
libxvid: Do not entangle coded_frame

4 years agosvq1enc: Do not entangle coded_frame
Vittorio Giovara [Wed, 15 Jul 2015 17:41:12 +0000 (18:41 +0100)]
svq1enc: Do not entangle coded_frame

4 years agoproresenc: Do not entangle coded_frame
Vittorio Giovara [Wed, 15 Jul 2015 17:41:11 +0000 (18:41 +0100)]
proresenc: Do not entangle coded_frame

4 years agoa64multienc: Do not entangle coded_frame
Vittorio Giovara [Wed, 15 Jul 2015 17:41:10 +0000 (18:41 +0100)]
a64multienc: Do not entangle coded_frame

This change (and the following ones of the same kind) is mainly to
simplify wrapping this section with an #if FF_API block later on.

No functional changes are applied, the fields of the context coded_frame
fields are directly initialized, instead of keeping a reference to the
coded_frame itself.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoroqvideoenc: Drop unneeded initialization
Vittorio Giovara [Wed, 15 Jul 2015 17:41:09 +0000 (18:41 +0100)]
roqvideoenc: Drop unneeded initialization

Its fields are never initialized to begin with.

4 years agompegvideo_enc: Drop unnneded initialization
Vittorio Giovara [Wed, 15 Jul 2015 17:41:08 +0000 (18:41 +0100)]
mpegvideo_enc: Drop unnneded initialization

coded_frame is already initialized where needed.

4 years agoavcodec: loongson relocate constants of idctdsp and h264pred
周晓勇 [Mon, 20 Jul 2015 05:45:49 +0000 (13:45 +0800)]
avcodec: loongson relocate constants of idctdsp and h264pred

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: loongson constants redefined with macros
周晓勇 [Mon, 20 Jul 2015 03:25:48 +0000 (11:25 +0800)]
avcodec: loongson constants redefined with macros

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/af_amerge: increase max number of channels from 32 to 64
Paul B Mahol [Sun, 19 Jul 2015 19:36:46 +0000 (19:36 +0000)]
avfilter/af_amerge: increase max number of channels from 32 to 64

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/af_astats: use UINT64_C instead of the LLU suffix
James Almer [Mon, 20 Jul 2015 03:04:38 +0000 (00:04 -0300)]
avfilter/af_astats: use UINT64_C instead of the LLU suffix

Should fix compilation with vs2012

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoMerge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
Michael Niedermayer [Mon, 20 Jul 2015 02:32:28 +0000 (04:32 +0200)]
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'

* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
  parseutil: Add more resolution aliases

Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoparseutil: Add more resolution aliases
Luca Barbato [Thu, 16 Jul 2015 22:31:54 +0000 (00:31 +0200)]
parseutil: Add more resolution aliases

Add DCI 2k and 4k and uhd1 and uhd2.

4 years agoavformat/mp3dec: Rename sync() function to avoid build failure on android
Michael Niedermayer [Mon, 20 Jul 2015 00:41:44 +0000 (02:41 +0200)]
avformat/mp3dec: Rename sync() function to avoid build failure on android

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/avidec: Fix demuxing avi with broken index
Michael Niedermayer [Mon, 20 Jul 2015 00:10:40 +0000 (02:10 +0200)]
avformat/avidec: Fix demuxing avi with broken index

Fixes: genio-avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/ffv1enc: fix assertion failure with unset bits per raw sample
Michael Niedermayer [Mon, 20 Jul 2015 00:10:04 +0000 (02:10 +0200)]
avcodec/ffv1enc: fix assertion failure with unset bits per raw sample

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/jpeg2000: Signal lossless / bit-exact video stream.
Carl Eugen Hoyos [Sun, 19 Jul 2015 20:34:13 +0000 (22:34 +0200)]
lavc/jpeg2000: Signal lossless / bit-exact video stream.

4 years agolavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.
Carl Eugen Hoyos [Sun, 19 Jul 2015 20:32:17 +0000 (22:32 +0200)]
lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.

4 years agolavc: Improve documentation for rc_max_rate and bit_rate.
Carl Eugen Hoyos [Sun, 19 Jul 2015 20:31:23 +0000 (22:31 +0200)]
lavc: Improve documentation for rc_max_rate and bit_rate.

Both may be set by user (libavformat) on decoding.

4 years agoavcodec/dds: Flip more R<->B cases
Michael Niedermayer [Sun, 19 Jul 2015 22:03:11 +0000 (00:03 +0200)]
avcodec/dds: Flip more R<->B cases

Fixes Ticket4665

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dds: fix paletted files
Michael Niedermayer [Sun, 19 Jul 2015 20:55:16 +0000 (22:55 +0200)]
avcodec/dds: fix paletted files

Fixes Ticket4664

The changed fate tests lack red/blue shades and thus look correct
either way

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoRELEASE: update to 2.7.git
James Almer [Sun, 19 Jul 2015 20:52:10 +0000 (17:52 -0300)]
RELEASE: update to 2.7.git

Signed-off-by: James Almer <jamrial@gmail.com>