ffmpeg.git
5 years agoMerge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
Michael Niedermayer [Sun, 10 Aug 2014 16:20:37 +0000 (18:20 +0200)]
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'

* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
  avresample: Introduce AVFrame-based API

Conflicts:
libavresample/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc_ps: verify P/T/L information
Christophe Gisquet [Sat, 9 Aug 2014 18:11:20 +0000 (20:11 +0200)]
hevc_ps: verify P/T/L information

This makes the SPS parsing a little, but barely, safer.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/options_table: leave xvidmmx AVOption in place
Michael Niedermayer [Sat, 9 Aug 2014 12:49:32 +0000 (14:49 +0200)]
avcodec/options_table: leave xvidmmx AVOption in place

Also mark it as deprecated through its help text

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc_mvs: set candidate availabilities
Christophe Gisquet [Sun, 10 Aug 2014 13:02:36 +0000 (15:02 +0200)]
hevc_mvs: set candidate availabilities

They might be left uninitialized otherwise since 3ad04608.

Fixes ticket #3840.

Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "lavc/utils: Do not require dimensions for PNG."
Derek Buitenhuis [Sun, 13 Jul 2014 18:32:56 +0000 (19:32 +0100)]
Revert "lavc/utils: Do not require dimensions for PNG."

mplayer-specifc hacks should not be in our codebase. mplayer should fix
its own code. It is not our responsibility to work around their broken
code.

This reverts commit e8e575633faf19711910cf9caf59f7db300a9ccd.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
5 years agoavresample: Introduce AVFrame-based API
Luca Barbato [Sun, 25 May 2014 15:49:15 +0000 (17:49 +0200)]
avresample: Introduce AVFrame-based API

5 years agohevc: fix incorrect sao buffer size
Christophe Gisquet [Sun, 10 Aug 2014 09:43:12 +0000 (11:43 +0200)]
hevc: fix incorrect sao buffer size

It previously used the output, cropped size, causing overreads/writes.

Fixes ticket #3839.

This issue was introduced by d249e682, which is not part of any release

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi: stop exporting internal functions
James Almer [Sun, 10 Aug 2014 00:04:34 +0000 (21:04 -0300)]
lavfi: stop exporting internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()
James Almer [Sun, 10 Aug 2014 00:53:33 +0000 (21:53 -0300)]
tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags()

lavc doesn't export ff_raw_pix_fmt_tags[] anymore.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'
Michael Niedermayer [Sun, 10 Aug 2014 00:20:54 +0000 (02:20 +0200)]
Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'

* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
  mpeg: Suppress a compiler warning on callback type

Conflicts:
libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9325d88eba8038b3e2a4485e473a018410379e2d'
Michael Niedermayer [Sun, 10 Aug 2014 00:09:13 +0000 (02:09 +0200)]
Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'

* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
  lavc: remove obsolete and disabled avpriv functions

Conflicts:
libavcodec/dv_profile.c
libavcodec/dv_profile.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '24c788f4878729a42150581d7ed7e9a11daf874d'
Michael Niedermayer [Sun, 10 Aug 2014 00:01:34 +0000 (02:01 +0200)]
Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'

* commit '24c788f4878729a42150581d7ed7e9a11daf874d':
  Remove obsolete FF_API_REFERENCE_DTS cruft.

Conflicts:
libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: disable FF_API_FAST_MALLOC
Michael Niedermayer [Sat, 9 Aug 2014 23:41:57 +0000 (01:41 +0200)]
avcodec: disable FF_API_FAST_MALLOC

It causes build failures in some cases and the functions are provided by
libavutil so the wraper should not be needed anymore

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'
Michael Niedermayer [Sat, 9 Aug 2014 23:36:21 +0000 (01:36 +0200)]
Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'

* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
  Remove obsolete FF_API_PROBE_MIME cruft.

Conflicts:
libavformat/avformat.h
libavformat/format.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sat, 9 Aug 2014 23:34:01 +0000 (01:34 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/avio: do not include bprint.h.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '472f9ed312ec784f7c72876b77163f4741880d05'
Michael Niedermayer [Sat, 9 Aug 2014 23:21:30 +0000 (01:21 +0200)]
Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'

* commit '472f9ed312ec784f7c72876b77163f4741880d05':
  Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

Conflicts:
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobump libpostproc and libswresample
Michael Niedermayer [Sat, 9 Aug 2014 22:53:27 +0000 (00:53 +0200)]
bump libpostproc and libswresample

this is needed / avoids some headaches  as one of their dependancies
(libavutil) was bumped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswresample-test: make it independant of the internal SWR_CH_MAX
Michael Niedermayer [Sat, 9 Aug 2014 23:10:45 +0000 (01:10 +0200)]
swresample-test: make it independant of the internal SWR_CH_MAX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavfilter/af_amerge: Do not depend on SWR_CH_MAX
Michael Niedermayer [Sat, 9 Aug 2014 23:07:56 +0000 (01:07 +0200)]
libavfilter/af_amerge: Do not depend on SWR_CH_MAX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_pan: Do not use SWR_CH_MAX
Michael Niedermayer [Sat, 9 Aug 2014 23:07:20 +0000 (01:07 +0200)]
avfilter/af_pan: Do not use SWR_CH_MAX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_pan: check if the number of channels where sucessfully set
Michael Niedermayer [Sat, 9 Aug 2014 23:06:52 +0000 (01:06 +0200)]
avfilter/af_pan: check if the number of channels where sucessfully set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: do not use SWR_CH_MAX
Michael Niedermayer [Sat, 9 Aug 2014 23:06:03 +0000 (01:06 +0200)]
ffmpeg: do not use SWR_CH_MAX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/version: delay removial of FF_API_AUDIO_CONVERT/FF_API_AVCODEC_RESAMPLE
Michael Niedermayer [Sat, 9 Aug 2014 22:38:48 +0000 (00:38 +0200)]
avcodec/version: delay removial of FF_API_AUDIO_CONVERT/FF_API_AVCODEC_RESAMPLE

Some applications still use this deprecated API
Its not nice to remove it when its still in use and as long as it doesnt
cause us any work to keep it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
Michael Niedermayer [Sat, 9 Aug 2014 22:26:45 +0000 (00:26 +0200)]
Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'

* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/version: leave old audio API
Michael Niedermayer [Sat, 9 Aug 2014 22:14:08 +0000 (00:14 +0200)]
avcodec/version: leave old audio API

If people prefer we can also drop it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flacdec: fix handling of av_samples_fill_arrays() return value
Michael Niedermayer [Sat, 9 Aug 2014 22:03:13 +0000 (00:03 +0200)]
avcodec/flacdec: fix handling of av_samples_fill_arrays() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodrop LLS1, rename LLS2 to LLS
Michael Niedermayer [Sat, 9 Aug 2014 21:03:26 +0000 (23:03 +0200)]
drop LLS1, rename LLS2 to LLS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: delay removial of FF_API_GET_CHANNEL_LAYOUT_COMPAT
Michael Niedermayer [Sat, 9 Aug 2014 21:19:54 +0000 (23:19 +0200)]
avutil: delay removial of FF_API_GET_CHANNEL_LAYOUT_COMPAT

avoids fate failure of join filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodelay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and FF_API_OLD_ENCODE_VIDEO
Michael Niedermayer [Sat, 9 Aug 2014 20:35:23 +0000 (22:35 +0200)]
delay removial of FF_API_CODEC_ID, FF_API_OLD_AVOPTIONS and FF_API_OLD_ENCODE_VIDEO

This prevents a build failure when bumping.
the uses could easily be updated / removed, if people prefer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: remove deprecated use of FF_IDCT_XVIDMMX
Michael Niedermayer [Sat, 9 Aug 2014 20:39:44 +0000 (22:39 +0200)]
avcodec: remove deprecated use of FF_IDCT_XVIDMMX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'
Michael Niedermayer [Sat, 9 Aug 2014 20:19:18 +0000 (22:19 +0200)]
Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'

* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84'
Michael Niedermayer [Sat, 9 Aug 2014 19:49:55 +0000 (21:49 +0200)]
Merge commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84'

* commit '7acdd3a1275bcd9cad48f9632169f6bbaeb39d84':
  hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()

Conflicts:
libavcodec/hevc_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg: Suppress a compiler warning on callback type
Luca Barbato [Wed, 6 Aug 2014 01:31:58 +0000 (03:31 +0200)]
mpeg: Suppress a compiler warning on callback type

5 years agoMerge commit '52a2c17ec006282f388071a831dfb21288611253'
Michael Niedermayer [Sat, 9 Aug 2014 19:35:11 +0000 (21:35 +0200)]
Merge commit '52a2c17ec006282f388071a831dfb21288611253'

* commit '52a2c17ec006282f388071a831dfb21288611253':
  hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()

Conflicts:
libavcodec/hevc_refs.c

See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'
Michael Niedermayer [Sat, 9 Aug 2014 19:17:14 +0000 (21:17 +0200)]
Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'

* commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4':
  hevc_filter: move some conditions out of loops

Conflicts:
libavcodec/hevc_filter.c

This is possibly less readable than the variant used before.
Thus please take a look and if people agree its worse, dont
hesitate to revert.

See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '70211539a39ca3854f8a9e97d51dc27caa079943'
Michael Niedermayer [Sat, 9 Aug 2014 19:01:06 +0000 (21:01 +0200)]
Merge commit '70211539a39ca3854f8a9e97d51dc27caa079943'

* commit '70211539a39ca3854f8a9e97d51dc27caa079943':
  hevc: deobfuscate slice/tile boundary handling for DBF

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_filter.c

See: a5c621aa852522c79146035b2db4b89d2e096d3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '55019715785790836f60870180e1764b06e6591c'
Michael Niedermayer [Sat, 9 Aug 2014 18:51:48 +0000 (20:51 +0200)]
Merge commit '55019715785790836f60870180e1764b06e6591c'

* commit '55019715785790836f60870180e1764b06e6591c':
  hevc_filter: drop more redundant checks

Conflicts:
libavcodec/hevc_filter.c

No change, as the removed checks where not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '65b8b6c476454d201348737527a1d9471f689278'
Michael Niedermayer [Sat, 9 Aug 2014 18:48:53 +0000 (20:48 +0200)]
Merge commit '65b8b6c476454d201348737527a1d9471f689278'

* commit '65b8b6c476454d201348737527a1d9471f689278':
  hevc_filter: drop redundant checks

Conflicts:
libavcodec/hevc_filter.c

No change as the removed checks where not in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'
Michael Niedermayer [Sat, 9 Aug 2014 18:32:38 +0000 (20:32 +0200)]
Merge commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9'

* commit '4d1ff2a489f4c60501b1a6a2d1f3874e61a77df9':
  hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

Conflicts:
libavcodec/hevc.c

See: 83976e40e89655162e5394cf8915d9b6d89702d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/dctdnoiz: remove a few indirections in idcts
Clément Bœsch [Sat, 9 Aug 2014 18:34:14 +0000 (20:34 +0200)]
avfilter/dctdnoiz: remove a few indirections in idcts

No change in the generated asm.

5 years agolavc: remove obsolete and disabled avpriv functions
Anton Khirnov [Wed, 6 Aug 2014 20:02:11 +0000 (20:02 +0000)]
lavc: remove obsolete and disabled avpriv functions

5 years agoRemove obsolete FF_API_REFERENCE_DTS cruft.
Anton Khirnov [Wed, 6 Aug 2014 19:58:57 +0000 (19:58 +0000)]
Remove obsolete FF_API_REFERENCE_DTS cruft.

5 years agoRemove obsolete FF_API_PROBE_MIME cruft.
Anton Khirnov [Wed, 6 Aug 2014 19:58:57 +0000 (19:58 +0000)]
Remove obsolete FF_API_PROBE_MIME cruft.

5 years agoRemove obsolete FF_API_AVFRAME_COLORSPACE cruft.
Anton Khirnov [Wed, 6 Aug 2014 19:58:57 +0000 (19:58 +0000)]
Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

5 years agoBump major versions of all libraries.
Anton Khirnov [Wed, 6 Aug 2014 19:57:14 +0000 (19:57 +0000)]
Bump major versions of all libraries.

5 years agoPostpone API-incompatible changes until the next bump.
Anton Khirnov [Wed, 6 Aug 2014 19:47:54 +0000 (19:47 +0000)]
Postpone API-incompatible changes until the next bump.

5 years agohevc_filter: avoid excessive calls to ff_hevc_get_ref_list()
Anton Khirnov [Sun, 27 Jul 2014 19:40:20 +0000 (19:40 +0000)]
hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()

1) each of the loops run within a single CTB, so the relevant reference
list is constant
2) when that CTB is, or lies on the same slice as, the current one, we
can use a simple access instead of a relatively expensive call to
ff_hevc_get_ref_list()

5 years agohevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()
Anton Khirnov [Sun, 27 Jul 2014 18:52:12 +0000 (18:52 +0000)]
hevc_refs: drop the handling of negative coordinates in ff_hevc_get_ref_list()

It makes no sense and cannot happen in any place from which this
function is called.

5 years agohevc_filter: move some conditions out of loops
Anton Khirnov [Sun, 27 Jul 2014 18:12:24 +0000 (18:12 +0000)]
hevc_filter: move some conditions out of loops

5 years agohevc: deobfuscate slice/tile boundary handling for DBF
Anton Khirnov [Sun, 27 Jul 2014 17:49:09 +0000 (17:49 +0000)]
hevc: deobfuscate slice/tile boundary handling for DBF

Use named constants instead of magic numbers, avoid using variables with
inverse meaning from what their name implies.

5 years agohevc_filter: drop more redundant checks
Anton Khirnov [Sun, 27 Jul 2014 17:10:04 +0000 (17:10 +0000)]
hevc_filter: drop more redundant checks

The if() around those loops ensures this condition is always false.

5 years agohevc_filter: drop redundant checks
Anton Khirnov [Sun, 27 Jul 2014 17:06:19 +0000 (17:06 +0000)]
hevc_filter: drop redundant checks

ff_hevc_deblocking_boundary_strengths() is never called if the
deblocking filter is disabled for the slice.

5 years agohevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled
Anton Khirnov [Sun, 27 Jul 2014 17:01:53 +0000 (17:01 +0000)]
hevc: calculate the dbf strength in hls_pcm_sample() only if dbf is enabled

5 years agolavf/avio: do not include bprint.h.
Nicolas George [Sat, 9 Aug 2014 13:51:04 +0000 (15:51 +0200)]
lavf/avio: do not include bprint.h.

See f75786f and 04bc370.

5 years agoavformat/avio: Fix "warning: struct AVBPrint declared inside parameter list"
Michael Niedermayer [Sat, 9 Aug 2014 13:30:03 +0000 (15:30 +0200)]
avformat/avio: Fix "warning: struct AVBPrint declared inside parameter list"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/avdct: add "xvid" alias AVOption and use FF_IDCT_XVID
Michael Niedermayer [Sat, 9 Aug 2014 10:42:07 +0000 (12:42 +0200)]
avcodec/avdct: add "xvid" alias AVOption and use FF_IDCT_XVID

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'
Michael Niedermayer [Sat, 9 Aug 2014 10:11:13 +0000 (12:11 +0200)]
Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'

* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
  avcodec: Rename xvidmmx IDCT to xvid

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation
Michael Niedermayer [Sat, 9 Aug 2014 02:49:09 +0000 (04:49 +0200)]
avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation

Fixes assertion failure
Fixes Ticket3822

as a side-effect this makes some mkv files a few bytes smaller

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: write reel_name metadata to tmcd atom
Mark Reid [Fri, 8 Aug 2014 17:37:06 +0000 (10:37 -0700)]
avformat/movenc: write reel_name metadata to tmcd atom

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAutodetect jpeg-ls files.
Carl Eugen Hoyos [Fri, 8 Aug 2014 19:19:29 +0000 (21:19 +0200)]
Autodetect jpeg-ls files.

5 years agoMerge commit '84d173d3de97c753234ab0c0b50551d51413d663'
Michael Niedermayer [Fri, 8 Aug 2014 20:00:29 +0000 (22:00 +0200)]
Merge commit '84d173d3de97c753234ab0c0b50551d51413d663'

* commit '84d173d3de97c753234ab0c0b50551d51413d663':
  xvididct: Ensure that the scantable permutation is always set correctly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6f1960ab71b4f18551243ce22d01913108265233'
Michael Niedermayer [Fri, 8 Aug 2014 19:53:20 +0000 (21:53 +0200)]
Merge commit '6f1960ab71b4f18551243ce22d01913108265233'

* commit '6f1960ab71b4f18551243ce22d01913108265233':
  idct: cosmetics: Drop one unnecessary if-block level

Conflicts:
libavcodec/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '444c73583d2848a542330c03949e1f933ac68f53'
Michael Niedermayer [Fri, 8 Aug 2014 19:38:32 +0000 (21:38 +0200)]
Merge commit '444c73583d2848a542330c03949e1f933ac68f53'

* commit '444c73583d2848a542330c03949e1f933ac68f53':
  configure: Only run gas checks on ARM and PowerPC

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0026e356d044e72b6e743b234708b8b8af457ac0'
Michael Niedermayer [Fri, 8 Aug 2014 19:38:12 +0000 (21:38 +0200)]
Merge commit '0026e356d044e72b6e743b234708b8b8af457ac0'

* commit '0026e356d044e72b6e743b234708b8b8af457ac0':
  configure: Die if gas is unavailable under aarch64 as well as ARM

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'
Michael Niedermayer [Fri, 8 Aug 2014 19:31:54 +0000 (21:31 +0200)]
Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'

* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472':
  mpeg: K&R formatting cosmetics

Conflicts:
libavformat/mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'
Michael Niedermayer [Fri, 8 Aug 2014 19:25:32 +0000 (21:25 +0200)]
Merge commit '454697603e4efdfc04fadec40518d56c7dc1e5dd'

* commit '454697603e4efdfc04fadec40518d56c7dc1e5dd':
  mpegts: Use av_free() to free memory allocated by av_strdup()

Conflicts:
libavformat/mpegtsenc.c

See: 92deb28945a5f2b58908d383f183cfc1bc1d7fae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: Check avpriv_new_chapter() for failure
Justin Jacobs [Thu, 7 Aug 2014 00:04:38 +0000 (20:04 -0400)]
avformat/matroskadec: Check avpriv_new_chapter() for failure

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Rename xvidmmx IDCT to xvid
Diego Biurrun [Wed, 6 Aug 2014 13:19:15 +0000 (06:19 -0700)]
avcodec: Rename xvidmmx IDCT to xvid

The Xvid IDCT is not MMX-specific.

5 years agoxvididct: Ensure that the scantable permutation is always set correctly
Diego Biurrun [Fri, 8 Aug 2014 10:10:05 +0000 (03:10 -0700)]
xvididct: Ensure that the scantable permutation is always set correctly

This fixes cases where the scantable permuation would get overwritten by
the general idctdsp initialization.

5 years agoidct: cosmetics: Drop one unnecessary if-block level
Diego Biurrun [Thu, 7 Aug 2014 22:04:39 +0000 (15:04 -0700)]
idct: cosmetics: Drop one unnecessary if-block level

5 years agoavfilter/dctdnoiz: use 32-bit (float) operations instead of 64 (double) for DCTs
Clément Bœsch [Fri, 8 Aug 2014 17:59:15 +0000 (19:59 +0200)]
avfilter/dctdnoiz: use 32-bit (float) operations instead of 64 (double) for DCTs

This makes the code about 1.5x faster without any noticeable difference
in the output.

5 years agoavfilter/dctdnoiz: remove forward declarations after previous commit
Clément Bœsch [Fri, 8 Aug 2014 17:46:49 +0000 (19:46 +0200)]
avfilter/dctdnoiz: remove forward declarations after previous commit

5 years agoavfilter/dctdnoiz: make color [de]correlation less clumsy
Clément Bœsch [Fri, 8 Aug 2014 17:44:40 +0000 (19:44 +0200)]
avfilter/dctdnoiz: make color [de]correlation less clumsy

This has no impact on overall performance, since the block DCT taking
most of the time anyway.

5 years agoavfilter/showcqt: add and extend tlength and volume options
Muhammad Faiz [Fri, 8 Aug 2014 14:58:35 +0000 (21:58 +0700)]
avfilter/showcqt: add and extend tlength and volume options

Add a tlength option with frequency and timeclamp variable

Add to the volume option support for frequency and timeclamp variable,
   a_weighting, b_weighting and c_weighting functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Support reading Avid's metadata for DNXHD codec.
Marek Fort [Thu, 7 Aug 2014 12:27:19 +0000 (14:27 +0200)]
avformat/mov: Support reading Avid's metadata for DNXHD codec.

The AALP atom is necessary to properly decode the alpha channel.
Needed for ticket #3707

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAutodetect webp files.
Carl Eugen Hoyos [Fri, 8 Aug 2014 14:14:18 +0000 (16:14 +0200)]
Autodetect webp files.

5 years agoconfigure: Check if libwebp compilation will succeed.
Carl Eugen Hoyos [Fri, 8 Aug 2014 14:06:10 +0000 (16:06 +0200)]
configure: Check if libwebp compilation will succeed.

5 years agoconfigure: Only run gas checks on ARM and PowerPC
Diego Biurrun [Wed, 6 Aug 2014 12:55:33 +0000 (05:55 -0700)]
configure: Only run gas checks on ARM and PowerPC

Standalone GNU assembly is not used on x86.

5 years agoconfigure: Die if gas is unavailable under aarch64 as well as ARM
Diego Biurrun [Wed, 6 Aug 2014 12:38:43 +0000 (05:38 -0700)]
configure: Die if gas is unavailable under aarch64 as well as ARM

5 years agompeg: K&R formatting cosmetics
Luca Barbato [Wed, 6 Aug 2014 03:01:15 +0000 (05:01 +0200)]
mpeg: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agompegts: Use av_free() to free memory allocated by av_strdup()
Diego Biurrun [Fri, 8 Aug 2014 09:46:21 +0000 (02:46 -0700)]
mpegts: Use av_free() to free memory allocated by av_strdup()

5 years agoreplace calls to url_feof() with avio_feof()
James Almer [Thu, 7 Aug 2014 20:12:41 +0000 (17:12 -0300)]
replace calls to url_feof() with avio_feof()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/avio: rename url_feof() to avio_feof()
James Almer [Thu, 7 Aug 2014 20:12:40 +0000 (17:12 -0300)]
lavf/avio: rename url_feof() to avio_feof()

It's a public function and should use the avio_ namespace

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: read reel_name metadata from tmcd atom
Mark Reid [Thu, 7 Aug 2014 17:20:36 +0000 (10:20 -0700)]
avformat/mov: read reel_name metadata from tmcd atom

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: Use av_freep() for pids
Michael Niedermayer [Thu, 7 Aug 2014 21:04:32 +0000 (23:04 +0200)]
avformat/mpegtsenc: Use av_freep() for pids

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: Free services array completely on failure
Michael Niedermayer [Thu, 7 Aug 2014 20:41:29 +0000 (22:41 +0200)]
avformat/mpegtsenc: Free services array completely on failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation
Michael Niedermayer [Thu, 7 Aug 2014 20:40:24 +0000 (22:40 +0200)]
avformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegtsenc: Check dynarray_add() for failure
Michael Niedermayer [Thu, 7 Aug 2014 20:28:59 +0000 (22:28 +0200)]
mpegtsenc: Check dynarray_add() for failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegtsenc: use the correct deallocation functions
Michael Niedermayer [Thu, 7 Aug 2014 20:23:00 +0000 (22:23 +0200)]
avformat/mpegtsenc: use the correct deallocation functions

Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'
Michael Niedermayer [Thu, 7 Aug 2014 20:11:37 +0000 (22:11 +0200)]
Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'

* commit '5b220e1e19c17b202d83d9be0868d152109ae8f0':
  mpegts: Fix memory leaks and related crashes in mpegs_write_header()

Conflicts:
libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'
Michael Niedermayer [Thu, 7 Aug 2014 19:59:15 +0000 (21:59 +0200)]
Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'

* commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc':
  mpegts: Avoid unnecessary variable shadowing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'
Michael Niedermayer [Thu, 7 Aug 2014 19:42:30 +0000 (21:42 +0200)]
Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'

* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
  mpegts: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/dctdnoiz: add 8x8 dct and make it the default
Clément Bœsch [Thu, 7 Aug 2014 19:21:03 +0000 (21:21 +0200)]
avfilter/dctdnoiz: add 8x8 dct and make it the default

8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.

5 years agoMerge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'
Michael Niedermayer [Thu, 7 Aug 2014 19:16:06 +0000 (21:16 +0200)]
Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'

* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
  mpegts: K&R formatting cosmetics

Conflicts:
libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: Correct function reference.
Michael Niedermayer [Thu, 7 Aug 2014 18:59:19 +0000 (20:59 +0200)]
doc/APIchanges: Correct function reference.

The commit bb789016d423d2cfacd2904ac66257bdf7f0964e
un-deprecated sws_getContext()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
Michael Niedermayer [Thu, 7 Aug 2014 18:52:40 +0000 (20:52 +0200)]
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'

* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
  swscale: Undeprecate sws_getContext()

Conflicts:
libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
Michael Niedermayer [Thu, 7 Aug 2014 18:43:11 +0000 (20:43 +0200)]
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
  avcodec: Undeprecate reordered_opaque

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'
Michael Niedermayer [Thu, 7 Aug 2014 18:21:56 +0000 (20:21 +0200)]
Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'

* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651':
  h264: fix interpretation of interleved stereo modes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/movenc: XMP metadata support.
Marek Fort [Wed, 6 Aug 2014 14:48:21 +0000 (16:48 +0200)]
avformat/movenc: XMP metadata support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: XMP metadata suppor.
Marek Fort [Wed, 6 Aug 2014 14:48:21 +0000 (16:48 +0200)]
avformat/mov: XMP metadata suppor.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>