ffmpeg.git
6 years agoMerge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'
Michael Niedermayer [Mon, 28 Jul 2014 10:53:17 +0000 (12:53 +0200)]
Merge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'

* commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be':
  hevc: eliminate an unnecessary array

Conflicts:
libavcodec/hevc.c

See: 255086a7e06417d98417cea192053b8a8531eb24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4b169321b84502302f2badb056ebee4fdaea94fa'
Michael Niedermayer [Mon, 28 Jul 2014 10:45:19 +0000 (12:45 +0200)]
Merge commit '4b169321b84502302f2badb056ebee4fdaea94fa'

* commit '4b169321b84502302f2badb056ebee4fdaea94fa':
  codec_desc: fix some typos in long codec names

See: 60b59d657e4d2c710391b8238533c2f3a51086f7
See: c3ca70204bd816bcef59c3d278b3d8607e2525ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c5fca0174db9ed45be821177f49bd9633152704d'
Michael Niedermayer [Mon, 28 Jul 2014 10:36:28 +0000 (12:36 +0200)]
Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d'

* commit 'c5fca0174db9ed45be821177f49bd9633152704d':
  lavc: add a property for marking codecs that support frame reordering

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: eliminate an unnecessary array
Anton Khirnov [Sun, 27 Jul 2014 08:17:29 +0000 (08:17 +0000)]
hevc: eliminate an unnecessary array

We do not need to store the value of the split flag.

6 years agocodec_desc: fix some typos in long codec names
Anton Khirnov [Sun, 20 Jul 2014 11:34:30 +0000 (11:34 +0000)]
codec_desc: fix some typos in long codec names

The rv20 typo spotted by Hendrik Leppkes <h.leppkes@gmail.com>

6 years agolavc: add a property for marking codecs that support frame reordering
Anton Khirnov [Sun, 20 Jul 2014 11:26:13 +0000 (11:26 +0000)]
lavc: add a property for marking codecs that support frame reordering

6 years agoMAINTAINERS: update list of releases i maintain
Michael Niedermayer [Mon, 28 Jul 2014 04:16:34 +0000 (06:16 +0200)]
MAINTAINERS: update list of releases i maintain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_spp: support setting dct avoptions from the filter graph string
Michael Niedermayer [Mon, 28 Jul 2014 03:16:03 +0000 (05:16 +0200)]
avfilter/vf_spp: support setting dct avoptions from the filter graph string

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: fix log message category
Michael Niedermayer [Mon, 28 Jul 2014 03:15:16 +0000 (05:15 +0200)]
avfilter/vf_scale: fix log message category

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/avdct: Add avcodec_dct_get_class()
Michael Niedermayer [Mon, 28 Jul 2014 03:14:39 +0000 (05:14 +0200)]
avcodec/avdct: Add avcodec_dct_get_class()

This should have been in the initial commit of AVDCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRELEASE: update, we are after 2.3 not 2.2
Michael Niedermayer [Mon, 28 Jul 2014 01:11:04 +0000 (03:11 +0200)]
RELEASE: update, we are after 2.3 not 2.2

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: eliminate unnecessary cbf_c{b,r} arrays
Anton Khirnov [Sun, 27 Jul 2014 19:56:05 +0000 (21:56 +0200)]
hevc: eliminate unnecessary cbf_c{b,r} arrays

- They are be replaced by passing additional parameters to the transform
functions.
- Adaptation to 4:2:2

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit f518bb22531c648f1c37f978b0c7ad2e71e04c25
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: fix skip_flag
Mickaël Raulet [Sun, 27 Jul 2014 20:52:14 +0000 (22:52 +0200)]
hevc: fix skip_flag

cherry picked from commit 509ae456551005b9bf9b4d9730b6247c97fdd990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: remove non necessary parameters to ff_hevc_set_qpy
Mickaël Raulet [Sun, 27 Jul 2014 20:56:06 +0000 (22:56 +0200)]
hevc: remove non necessary parameters to ff_hevc_set_qpy

cherry picked from commit 6f58c111ad9920d983bb18eacf901193bac5d937

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/decoders: mention native Opus decoder
Lou Logan [Sun, 27 Jul 2014 20:46:55 +0000 (12:46 -0800)]
doc/decoders: mention native Opus decoder

Signed-off-by: Lou Logan <lou@lrcd.com>
6 years agoFix standalone compilation of the webm_dash_manifest demuxer.
Carl Eugen Hoyos [Sun, 27 Jul 2014 21:27:14 +0000 (23:27 +0200)]
Fix standalone compilation of the webm_dash_manifest demuxer.

6 years agoFix standalone compilation of the legacy mpegvideo decoder.
Carl Eugen Hoyos [Sun, 27 Jul 2014 21:22:10 +0000 (23:22 +0200)]
Fix standalone compilation of the legacy mpegvideo decoder.

Second try.

6 years agoFix standalone compilation of the legacy mpegvideo decoder.
Carl Eugen Hoyos [Sun, 27 Jul 2014 21:13:10 +0000 (23:13 +0200)]
Fix standalone compilation of the legacy mpegvideo decoder.

6 years agofate/hevc: update fate with 9 bitstreams
Mickaël Raulet [Sat, 26 Jul 2014 08:45:54 +0000 (10:45 +0200)]
fate/hevc: update fate with 9 bitstreams
- all of them testing HEVC version 1

cherry picked from commit adcdabb4dd062694fb8de6df0faecaad1c36ba33

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'
Michael Niedermayer [Sun, 27 Jul 2014 19:47:42 +0000 (21:47 +0200)]
Merge commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5'

* commit '42eb9154a83e9a7aedb1168b2f1112af765cf2b5':
  fate: support testing of release branches

Conflicts:
tests/fate.sh

The communication protocol is left at version 0 as our fate server
hasnt been updated to support this yet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix memalign hack auto detection
Michael Niedermayer [Sun, 27 Jul 2014 19:02:41 +0000 (21:02 +0200)]
configure: fix memalign hack auto detection

Should fix fate on haiku

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: fix "-flags" option
Michael Niedermayer [Sun, 27 Jul 2014 17:58:47 +0000 (19:58 +0200)]
doc/examples/muxing: fix "-flags" option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: hevc_mc: load less data in epel filters
Christophe Gisquet [Fri, 25 Jul 2014 13:08:49 +0000 (15:08 +0200)]
x86: hevc_mc: load less data in epel filters

Before:
5679 decicycles in epel_bi, 2059976 runs, 37176 skips
3468 decicycles in epel_uni, 1040886 runs, 7690 skips

After:
5323 decicycles in epel_bi, 2059493 runs, 37659 skips
3262 decicycles in epel_uni, 1040871 runs, 7705 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: hevc_mc: replace one lea by add
Christophe Gisquet [Fri, 25 Jul 2014 17:07:27 +0000 (19:07 +0200)]
x86: hevc_mc: replace one lea by add

Should have been in 036f11bdb565.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_spp: use AVDCT
Michael Niedermayer [Sat, 26 Jul 2014 13:24:42 +0000 (15:24 +0200)]
avfilter/vf_spp: use AVDCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: add avdct
Michael Niedermayer [Sat, 26 Jul 2014 13:22:27 +0000 (15:22 +0200)]
avcodec: add avdct

This provides a public sustainable API/ABI for DCT functions.
Only externally used dct functions are included.
The structure is extensible without ABI issues compared to the
existing dct contexts.

See Mailing list and IRC log of 2014-07-26/27

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: support testing of release branches
Janne Grunau [Sat, 26 Jul 2014 21:29:46 +0000 (23:29 +0200)]
fate: support testing of release branches

Adding 'branch=release/10' to the fate config file will check the
release/10 branch instead of master. If no branch is specified it will
use 'master' so that existing config are still valid.

The server side changes are already deployed, see
https://fate.libav.org/v10/ for an example. The server supports only the
release/* branches.

The server enforces that a single slot tests always the same branch.
Please append "-v$RELEASE" to the slot of release branch configs or make
the slot otherwise unique.

A different fate samples dir is needed for each release branch. make
fate-rsync has the correct URL in each branch.

6 years agoavcodec/ppc/idctdsp: Only select non bitexact IDCTs by default when bitexact is not set
Michael Niedermayer [Sun, 27 Jul 2014 12:16:07 +0000 (14:16 +0200)]
avcodec/ppc/idctdsp: Only select non bitexact IDCTs by default when bitexact is not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexac...
Michael Niedermayer [Sun, 27 Jul 2014 12:16:07 +0000 (14:16 +0200)]
avcodec/arm/idctdsp_init_arm*: Only select non bitexact IDCTs by default when bitexact is not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'
Michael Niedermayer [Sun, 27 Jul 2014 10:23:53 +0000 (12:23 +0200)]
Merge commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c'

* commit '541427ab4d5b4b6f5a90a687a06decdb78e7bc3c':
  eamad: use the bytestream2 API instead of AV_RL

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Exchange tmp_frame and frame
Michael Niedermayer [Sun, 27 Jul 2014 02:10:06 +0000 (04:10 +0200)]
doc/examples/muxing: Exchange tmp_frame and frame

Reduces difference to 56f98e340fca894a76d1ddbe33118b8d8c4db34a

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoeamad: use the bytestream2 API instead of AV_RL
Anton Khirnov [Sun, 20 Jul 2014 12:06:47 +0000 (12:06 +0000)]
eamad: use the bytestream2 API instead of AV_RL

This is safer and possibly fixes invalid reads on truncated data.

CC:libav-stable@libav.org

6 years agoavcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream
Chris \"Koying\" Browet [Sat, 26 Jul 2014 07:15:57 +0000 (09:15 +0200)]
avcodec/h264_mp4toannexb_bsf: fix issue when sps/pps are already in the bistream

6 years agofate/hevc: adding CONFWIN_A conformance test
Mickaël Raulet [Sat, 26 Jul 2014 09:47:15 +0000 (11:47 +0200)]
fate/hevc: adding CONFWIN_A conformance test

cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/hevc: add flags unaligned
Mickaël Raulet [Sat, 26 Jul 2014 09:47:15 +0000 (11:47 +0200)]
fate/hevc: add flags unaligned

cherry picked from commit 3b69a2dc469160ee87367191e630e8398e832227

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/hevc: add BUMPING bitstream test
Mickaël Raulet [Fri, 25 Jul 2014 14:57:40 +0000 (16:57 +0200)]
fate/hevc: add BUMPING bitstream test

cherry picked from commit d4d61a071f087db2a4bc2b49559d40dd350a841e

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'
Michael Niedermayer [Sun, 27 Jul 2014 00:16:04 +0000 (02:16 +0200)]
Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'

* commit '7215fcf84032118ecd9fb54fb14154d69fea638d':
  avformat: Mark AVOutputFormat argument in avformat_query_codec as const

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'
Michael Niedermayer [Sun, 27 Jul 2014 00:09:41 +0000 (02:09 +0200)]
Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'

* commit 'ec4f04da1a3462dac429b9d15dee5f027309da15':
  avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

Conflicts:
libavformat/format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '53abe32409f13687c864b3cda077a1aa906a2459'
Michael Niedermayer [Sat, 26 Jul 2014 23:57:34 +0000 (01:57 +0200)]
Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'

* commit '53abe32409f13687c864b3cda077a1aa906a2459':
  avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: mark correct frame as writeable
Michael Niedermayer [Sat, 26 Jul 2014 23:35:10 +0000 (01:35 +0200)]
doc/examples/muxing: mark correct frame as writeable

Bug found from comparing 56f98e340fca894a76d1ddbe33118b8d8c4db34a to HEAD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Always use swr, simplifies code slightly
Michael Niedermayer [Sat, 26 Jul 2014 23:32:19 +0000 (01:32 +0200)]
doc/examples/muxing: Always use swr, simplifies code slightly

Idea-from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: add alloc_audio_frame() and use it to simplify code.
Anton Khirnov [Sat, 26 Jul 2014 23:12:25 +0000 (01:12 +0200)]
doc/examples/muxing: add alloc_audio_frame() and use it to simplify code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Move samples_count to OutputStream
Michael Niedermayer [Sat, 26 Jul 2014 23:05:05 +0000 (01:05 +0200)]
doc/examples/muxing: Move samples_count to OutputStream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: free swr context at the end
Michael Niedermayer [Sat, 26 Jul 2014 22:50:58 +0000 (00:50 +0200)]
doc/examples/muxing: free swr context at the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_idct: add 12bit idct_dc
James Almer [Sat, 26 Jul 2014 18:08:51 +0000 (15:08 -0300)]
x86/hevc_idct: add 12bit idct_dc

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevcdsp_init: make license header consistent
Michael Niedermayer [Sat, 26 Jul 2014 22:28:44 +0000 (00:28 +0200)]
avcodec/x86/hevcdsp_init: make license header consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'
Michael Niedermayer [Sat, 26 Jul 2014 22:19:25 +0000 (00:19 +0200)]
Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'

* commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d':
  hevc: SSE2 and SSSE3 loop filters

Conflicts:
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/x86/Makefile
libavcodec/x86/hevc_deblock.asm
libavcodec/x86/hevcdsp_init.c

See: de7b89fd43f850d77cf24ad6ae50185dfe391e91 and several others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a'
Michael Niedermayer [Sat, 26 Jul 2014 21:51:43 +0000 (23:51 +0200)]
Merge commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a'

* commit '73bb8f61d48dbf7237df2e9cacd037f12b84b00a':
  hevcdsp: remove an unneeded variable in the loop filter

Conflicts:
libavcodec/hevc_filter.c

See: d7e162d46b4a0fc03ca5161cdcac840152f048cb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: Mark AVOutputFormat argument in avformat_query_codec as const
Diego Biurrun [Sat, 26 Jul 2014 09:50:59 +0000 (02:50 -0700)]
avformat: Mark AVOutputFormat argument in avformat_query_codec as const

6 years agoavformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
Diego Biurrun [Sat, 26 Jul 2014 09:47:41 +0000 (02:47 -0700)]
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

6 years agoavcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const
Diego Biurrun [Sat, 26 Jul 2014 09:46:40 +0000 (02:46 -0700)]
avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

6 years agoMerge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'
Michael Niedermayer [Sat, 26 Jul 2014 21:28:36 +0000 (23:28 +0200)]
Merge commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a'

* commit '56f98e340fca894a76d1ddbe33118b8d8c4db34a':
  output example: convert audio to the format supported by the encoder

Conflicts:
doc/examples/muxing.c

Not merged as our example code already does that for what is needed
and we generate matching data for the rest. generating fixed data
and converting all parameters could be done of course.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: Support setting flags, for example for setting bitexact
Michael Niedermayer [Sat, 26 Jul 2014 20:46:34 +0000 (22:46 +0200)]
doc/examples/muxing: Support setting flags, for example for setting bitexact

This would allow the example to be used in regression tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: select a supported sample rate for the encoder, favor 44100
Michael Niedermayer [Sat, 26 Jul 2014 20:19:10 +0000 (22:19 +0200)]
doc/examples/muxing: select a supported sample rate for the encoder, favor 44100

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: pick a supported channel layout if stereo isnt supported by...
Michael Niedermayer [Sat, 26 Jul 2014 20:00:07 +0000 (22:00 +0200)]
doc/examples/muxing: pick a supported channel layout if stereo isnt supported by the encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples/muxing: move swr context to OutputStream
Michael Niedermayer [Sat, 26 Jul 2014 19:42:46 +0000 (21:42 +0200)]
doc/examples/muxing: move swr context to OutputStream

Idea from: 56f98e340fca894a76d1ddbe33118b8d8c4db34a
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '884f7c975f0af25febe86660e87bf3b2165a0309'
Michael Niedermayer [Sat, 26 Jul 2014 19:04:31 +0000 (21:04 +0200)]
Merge commit '884f7c975f0af25febe86660e87bf3b2165a0309'

* commit '884f7c975f0af25febe86660e87bf3b2165a0309':
  output example: set the stream timebase

Conflicts:
doc/examples/muxing.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc_idct: replace old and unused idct functions
James Almer [Sat, 26 Jul 2014 07:47:14 +0000 (04:47 -0300)]
x86/hevc_idct: replace old and unused idct functions

Only 8-bit and 10-bit idct_dc() functions are included (adding others should be trivial).

Benchmarks on an Intel Core i5-4200U:

idct8x8_dc
       SSE2   MMXEXT  C
cycles 22     26      57

idct16x16_dc
       AVX2   SSE2    C
cycles 27     32      249

idct32x32_dc
       AVX2   SSE2    C
cycles 62     126     1375

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: SSE2 and SSSE3 loop filters
Pierre Edouard Lepere [Wed, 18 Jun 2014 03:57:16 +0000 (05:57 +0200)]
hevc: SSE2 and SSSE3 loop filters

Additional contributions by James Almer <jamrial@gmail.com>,
Carl Eugen Hoyos <cehoyos@ag.or.at>, Fiona Glaser <fiona@x264.com> and
Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevcdsp: remove an unneeded variable in the loop filter
Anton Khirnov [Sat, 12 Jul 2014 08:36:03 +0000 (08:36 +0000)]
hevcdsp: remove an unneeded variable in the loop filter

beta0 and beta1 will always be the same

6 years agooutput example: convert audio to the format supported by the encoder
Anton Khirnov [Thu, 24 Jul 2014 17:47:26 +0000 (17:47 +0000)]
output example: convert audio to the format supported by the encoder

6 years agooutput example: set the stream timebase
Anton Khirnov [Wed, 23 Jul 2014 11:09:16 +0000 (11:09 +0000)]
output example: set the stream timebase

This is required by the new API.

6 years agohevc: add support for bumping process
Mickaël Raulet [Sat, 26 Jul 2014 12:27:56 +0000 (14:27 +0200)]
hevc: add support for bumping process

cherry picked from commit 8aa2fb7df3cffc67a3fd03a3a7eb49dbed4094c7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoreintroduce avpriv_dsputil_init() to maintain ABI until next soname bump
Michael Niedermayer [Fri, 25 Jul 2014 19:56:13 +0000 (21:56 +0200)]
reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: replace pulse-simple with pulse
Lukasz Marek [Sat, 26 Jul 2014 01:38:27 +0000 (03:38 +0200)]
configure: replace pulse-simple with pulse

pulse-simple is additional library built on top of PulseAudio.
It causes ffmpeg to link to library which is not needed anymore.
This commit removes that redundant dependency.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: hevc_mc: replace simple leas by adds
Christophe Gisquet [Thu, 24 Jul 2014 15:23:47 +0000 (17:23 +0200)]
x86: hevc_mc: replace simple leas by adds

lea is detrimental for those simple cases. No impact overall to
the change though.

Before:
15017 decicycles in q, 1016152 runs, 32424 skips
15382 decicycles in q_bi, 1013673 runs, 34903 skips
3713 decicycles in e, 2074534 runs, 22618 skips
3901 decicycles in e_bi, 2065509 runs, 31643 skips
7852 decicycles in q_uni, 520165 runs, 4123 skips
2398 decicycles in e_uni, 1043339 runs, 5237 skips

After:
14898 decicycles in q, 1016295 runs, 32281 skips
15119 decicycles in q_bi, 1015392 runs, 33184 skips
3682 decicycles in e, 2073224 runs, 23928 skips
3720 decicycles in e_bi, 2065043 runs, 32109 skips
7643 decicycles in q_uni, 520280 runs, 4008 skips
2363 decicycles in e_uni, 1043780 runs, 4796 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'
Michael Niedermayer [Sat, 26 Jul 2014 00:47:04 +0000 (02:47 +0200)]
Merge commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3'

* commit 'd8520d3ee032bf18f28897e0109f44b405caf5e3':
  mpegvideo: Move QMAT_SHIFT* defines to the only place they are used

Conflicts:
libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'
Michael Niedermayer [Sat, 26 Jul 2014 00:34:47 +0000 (02:34 +0200)]
Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'

* commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8':
  mpegvideo: Move ME_MAP_* defines to the only place they are used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ff85334375c6733c6116ea3686f128b4a11f33e7'
Michael Niedermayer [Sat, 26 Jul 2014 00:17:05 +0000 (02:17 +0200)]
Merge commit 'ff85334375c6733c6116ea3686f128b4a11f33e7'

* commit 'ff85334375c6733c6116ea3686f128b4a11f33e7':
  mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines

CHROMA_444 is not removed as we do support CHROMA_444 and use the
identifier

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: fix RAP_B_Bossen
Mickaël Raulet [Fri, 25 Jul 2014 14:37:39 +0000 (16:37 +0200)]
hevc: fix RAP_B_Bossen

cherry picked from commit 903236292f066bc321080e3e2192b64f8943d960

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc: add 12bits support for MC
Mickaël Raulet [Fri, 25 Jul 2014 16:55:23 +0000 (18:55 +0200)]
x86/hevc: add 12bits support for MC

cherry picked from commit 3fcb7a4595a6f40100a22110a5805e3b7510c0fd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc: remove unused constant in deblocking filter
Mickaël Raulet [Fri, 25 Jul 2014 16:02:46 +0000 (18:02 +0200)]
x86/hevc: remove unused constant in deblocking filter

cherry picked from commit a3f7282eaa6f1ab0524fb966c6eade50c3025f99

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/hevc: add 12bits support for deblocking filter
Mickaël Raulet [Fri, 25 Jul 2014 15:55:40 +0000 (17:55 +0200)]
x86/hevc: add 12bits support for deblocking filter

cherry picked from commit 97d46afe320c7d61d7b9525e5f5588355cde4bb0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mux: ignore delayed vp8/9 packets in max_interleave_delta calculation
Michael Niedermayer [Fri, 25 Jul 2014 22:56:32 +0000 (00:56 +0200)]
avformat/mux: ignore delayed vp8/9 packets in max_interleave_delta calculation

libvpx adds very significant delay, which appears normal and we must
buffer all other streams no matter what to interleave them correctly

Fixes Ticket3440

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: ensure the right buffer is used in set_string_number()
Michael Niedermayer [Fri, 25 Jul 2014 19:29:43 +0000 (21:29 +0200)]
avutil/opt: ensure the right buffer is used in set_string_number()

Fixes use of uninitialized memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: Move QMAT_SHIFT* defines to the only place they are used
Diego Biurrun [Wed, 23 Jul 2014 20:53:54 +0000 (13:53 -0700)]
mpegvideo: Move QMAT_SHIFT* defines to the only place they are used

6 years agompegvideo: Move ME_MAP_* defines to the only place they are used
Diego Biurrun [Wed, 23 Jul 2014 20:50:35 +0000 (13:50 -0700)]
mpegvideo: Move ME_MAP_* defines to the only place they are used

6 years agompegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines
Diego Biurrun [Wed, 23 Jul 2014 20:49:16 +0000 (13:49 -0700)]
mpegvideo: Drop unused MPEG_BUF_SIZE and CHROMA_444 defines

6 years agoMerge commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf'
Michael Niedermayer [Fri, 25 Jul 2014 18:42:07 +0000 (20:42 +0200)]
Merge commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf'

* commit '165e9df19567ec0b6abee1ee2c26027e6d7aa7bf':
  fft-test: Pass the right struct members instead of casting

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofft-test: Pass the right struct members instead of casting
Diego Biurrun [Wed, 23 Jul 2014 20:38:35 +0000 (13:38 -0700)]
fft-test: Pass the right struct members instead of casting

6 years agoRELEASE_NOTES: fix WebVTT decoder typo (-> encoder)
Timothy Gu [Fri, 25 Jul 2014 02:39:36 +0000 (19:39 -0700)]
RELEASE_NOTES: fix WebVTT decoder typo (-> encoder)

Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'
Michael Niedermayer [Fri, 25 Jul 2014 11:11:23 +0000 (13:11 +0200)]
Merge commit '58e65e44f435243dc72dfce1f8af8afcf1319f34'

* commit '58e65e44f435243dc72dfce1f8af8afcf1319f34':
  vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c

Conflicts:
libavcodec/vc1dsp.c

See: 319235c67c59d6abaa78d5af57121ab9816f937d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'
Michael Niedermayer [Fri, 25 Jul 2014 10:58:03 +0000 (12:58 +0200)]
Merge commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac'

* commit '7fb993d338d88f2f62e0a358b6c9f3eb9a3a08ac':
  qpeldsp: Mark source pointer in qpel_mc_func function pointer const

Conflicts:
libavcodec/h264qpel_template.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/rv40dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'
Michael Niedermayer [Fri, 25 Jul 2014 10:35:55 +0000 (12:35 +0200)]
Merge commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b'

* commit '060e4a9e0627adcda9101dd68ec7f22b4ce22b5b':
  dct/rdft: Remove duplicate typedefs for context structs

See: 005e81d6cff4071847fe6e6b6de3b5d709c76de9
See: 77304cf3523cbeec56a29749fea5c21e610be644
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c
Diego Biurrun [Thu, 24 Jul 2014 23:22:44 +0000 (16:22 -0700)]
vc1dsp: Add wrappers for {avg|put}_vc1_mspel_mc00_c

This avoids invoking the wrapped functions with too many arguments.

6 years agoqpeldsp: Mark source pointer in qpel_mc_func function pointer const
Diego Biurrun [Thu, 24 Jul 2014 23:19:45 +0000 (16:19 -0700)]
qpeldsp: Mark source pointer in qpel_mc_func function pointer const

6 years agodct/rdft: Remove duplicate typedefs for context structs
Diego Biurrun [Wed, 23 Jul 2014 14:36:19 +0000 (07:36 -0700)]
dct/rdft: Remove duplicate typedefs for context structs

The typedefs also exist in the avfft.h header and since typedefs cannot be
legally redefined in C, the code fails to compile with some compilers.

This reverts commits 11c7155cce and 57f1b1dcc7.

6 years agolavf/avio: do not include bprint.h.
Nicolas George [Thu, 24 Jul 2014 07:34:10 +0000 (09:34 +0200)]
lavf/avio: do not include bprint.h.

C++ chokes on the definition of AVBPrint.
Including avio.h from c++ code used to work.
Fix trac ticket #3800.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/segment: re-interleave packets if needed
Michael Niedermayer [Thu, 24 Jul 2014 21:22:33 +0000 (23:22 +0200)]
avformat/segment: re-interleave packets if needed

Fixes part of Ticket 3797

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mux: support re-interleaving packets in ff_write_chained()
Michael Niedermayer [Thu, 24 Jul 2014 20:39:22 +0000 (22:39 +0200)]
avformat/mux: support re-interleaving packets in ff_write_chained()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mux: keep AVPacket fields consistent in ff_write_chained()
Michael Niedermayer [Thu, 24 Jul 2014 20:33:21 +0000 (22:33 +0200)]
avformat/mux: keep AVPacket fields consistent in ff_write_chained()

This might have caused double frees in theory, i do not have a test case
though

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in...
Michael Niedermayer [Thu, 24 Jul 2014 18:25:29 +0000 (20:25 +0200)]
avformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in 16bit

This is somewhat unusual so its better to use warning level than debug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '436ced244fadcde2c0b925627920e84b25482542'
Michael Niedermayer [Thu, 24 Jul 2014 16:53:21 +0000 (18:53 +0200)]
Merge commit '436ced244fadcde2c0b925627920e84b25482542'

* commit '436ced244fadcde2c0b925627920e84b25482542':
  mpegenccontext: Remove unused opaque pointer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskaenc: Start new cluster if relative timestamp could not otherwise...
Michael Niedermayer [Thu, 24 Jul 2014 16:19:50 +0000 (18:19 +0200)]
avformat/matroskaenc: Start new cluster if relative timestamp could not otherwise be stored

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskaenc: Factor mkv_start_new_cluster() out
Michael Niedermayer [Thu, 24 Jul 2014 16:19:11 +0000 (18:19 +0200)]
avformat/matroskaenc: Factor mkv_start_new_cluster() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegenccontext: Remove unused opaque pointer
Nidhi Makhijani [Thu, 24 Jul 2014 14:52:43 +0000 (20:22 +0530)]
mpegenccontext: Remove unused opaque pointer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 24 Jul 2014 14:50:40 +0000 (16:50 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Ignore xing number of frames if the file is larger than indicated.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: propagate error code from set_sps()
Timothy Gu [Fri, 18 Jul 2014 01:26:44 +0000 (18:26 -0700)]
hevc: propagate error code from set_sps()

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoIgnore xing number of frames if the file is larger than indicated.
Carl Eugen Hoyos [Thu, 24 Jul 2014 13:34:36 +0000 (15:34 +0200)]
Ignore xing number of frames if the file is larger than indicated.

Fixes ticket #3777.

6 years agoPrint a warning instead of requesting a sample for an invalid exif tag.
Carl Eugen Hoyos [Thu, 24 Jul 2014 09:58:11 +0000 (11:58 +0200)]
Print a warning instead of requesting a sample for an invalid exif tag.

Fixes ticket #3792.
Reviewed-by: Thilo Borgmann