ffmpeg.git
5 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>
5 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>
5 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>
5 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.

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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

5 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

5 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>
5 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

5 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>
5 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>
5 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>
5 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>
5 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.

5 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

5 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.

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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
5 years agolavfi/src_movie: minor simplifications
Lukasz Marek [Sun, 11 May 2014 04:08:09 +0000 (06:08 +0200)]
lavfi/src_movie: minor simplifications

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/src_movie: remove frame from priv context
Lukasz Marek [Sun, 11 May 2014 04:08:08 +0000 (06:08 +0200)]
lavfi/src_movie: remove frame from priv context

This variable is used only inside one function.
There is no need to store it in context.

This also may prevent crush by double free frame.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'
Michael Niedermayer [Thu, 24 Jul 2014 00:08:14 +0000 (02:08 +0200)]
Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'

* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
  http: K&R formatting cosmetics

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'
Michael Niedermayer [Wed, 23 Jul 2014 23:50:01 +0000 (01:50 +0200)]
Merge commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4'

* commit 'd0de7330b973b354e2ceb0b99fd545b868b0a9c4':
  fft-test: Pass correct struct members to (i)dct functions

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6133d65861f265d429ade53e910fe877c95a1615'
Michael Niedermayer [Wed, 23 Jul 2014 23:22:31 +0000 (01:22 +0200)]
Merge commit '6133d65861f265d429ade53e910fe877c95a1615'

* commit '6133d65861f265d429ade53e910fe877c95a1615':
  fft-test: K&R formatting cosmetics

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/fft-test: fix memory alloc checks
Michael Niedermayer [Wed, 23 Jul 2014 22:46:15 +0000 (00:46 +0200)]
avcodec/fft-test: fix memory alloc checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'
Michael Niedermayer [Wed, 23 Jul 2014 22:35:40 +0000 (00:35 +0200)]
Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'

* commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9':
  fft-test: Check memory allocations

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohttp: K&R formatting cosmetics
Diego Biurrun [Tue, 22 Jul 2014 18:42:03 +0000 (11:42 -0700)]
http: K&R formatting cosmetics

Also comment some #endifs and reshuffle headers into canonical order.

5 years agox86: hevcdsp: align
Christophe Gisquet [Tue, 22 Jul 2014 08:57:34 +0000 (10:57 +0200)]
x86: hevcdsp: align

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofft-test: Pass correct struct members to (i)dct functions
Diego Biurrun [Wed, 23 Jul 2014 14:33:28 +0000 (07:33 -0700)]
fft-test: Pass correct struct members to (i)dct functions

This fixes a number of incompatible pointer type warnings.

5 years agofft-test: K&R formatting cosmetics
Diego Biurrun [Fri, 18 Jul 2014 12:37:11 +0000 (05:37 -0700)]
fft-test: K&R formatting cosmetics

Also rearrange #includes into canonical order.

5 years agohevc_mvs: avoid deriving tmvp in amvp
Christophe Gisquet [Wed, 23 Jul 2014 16:27:44 +0000 (18:27 +0200)]
hevc_mvs: avoid deriving tmvp in amvp

Reduces on a sequence number of calls from 933685 to 586271.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevcdsp: change types of SAO parameters
Christophe Gisquet [Wed, 23 Jul 2014 11:39:40 +0000 (13:39 +0200)]
hevcdsp: change types of SAO parameters

From openhevc

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7288b345850792430302a8f85a4b29140b770497'
Michael Niedermayer [Wed, 23 Jul 2014 18:48:05 +0000 (20:48 +0200)]
Merge commit '7288b345850792430302a8f85a4b29140b770497'

* commit '7288b345850792430302a8f85a4b29140b770497':
  fft-test: Drop unnecessary pointer indirection for context structs

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'
Michael Niedermayer [Wed, 23 Jul 2014 18:40:41 +0000 (20:40 +0200)]
Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'

* commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb':
  fft-test: Reduce variable scope where sensibly possible

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'
Michael Niedermayer [Wed, 23 Jul 2014 18:20:04 +0000 (20:20 +0200)]
Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'

* commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7':
  mpegenccontext: Remove unused dct_unquantize_h261 function pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/lavfi: work with non-mappable files for graph_file option
Andrey Utkin [Wed, 23 Jul 2014 13:12:39 +0000 (16:12 +0300)]
lavd/lavfi: work with non-mappable files for graph_file option

Example of non-mappable file is /dev/stdin. Previously passing it as
graph_file value returned error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavio: Introduce avio_read_to_bprint(avioctx, bp, max_size)
Andrey Utkin [Wed, 23 Jul 2014 13:12:38 +0000 (16:12 +0300)]
avio: Introduce avio_read_to_bprint(avioctx, bp, max_size)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too
Michael Niedermayer [Wed, 23 Jul 2014 15:08:56 +0000 (17:08 +0200)]
avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too

Fixes Ticket 3787

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA
Michael Niedermayer [Wed, 23 Jul 2014 15:39:30 +0000 (17:39 +0200)]
avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: factor is_extra() out
Michael Niedermayer [Wed, 23 Jul 2014 15:38:41 +0000 (17:38 +0200)]
avcodec/h264: factor is_extra() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofft-test: Check memory allocations
Diego Biurrun [Mon, 21 Jul 2014 09:12:32 +0000 (02:12 -0700)]
fft-test: Check memory allocations

5 years agofft-test: Drop unnecessary pointer indirection for context structs
Diego Biurrun [Thu, 26 Jun 2014 23:14:30 +0000 (16:14 -0700)]
fft-test: Drop unnecessary pointer indirection for context structs

5 years agofft-test: Reduce variable scope where sensibly possible
Diego Biurrun [Thu, 26 Jun 2014 00:35:03 +0000 (17:35 -0700)]
fft-test: Reduce variable scope where sensibly possible

Also merge variable declaration and initialization.

5 years agoMerge commit '20ec0daaa1cdd3996ac6ed0198de961129474044'
Michael Niedermayer [Wed, 23 Jul 2014 12:26:55 +0000 (14:26 +0200)]
Merge commit '20ec0daaa1cdd3996ac6ed0198de961129474044'

* commit '20ec0daaa1cdd3996ac6ed0198de961129474044':
  fft-test: Make global exptab variable static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'
Michael Niedermayer [Wed, 23 Jul 2014 12:15:20 +0000 (14:15 +0200)]
Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'

* commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb':
  mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegenccontext: Remove unused dct_unquantize_h261 function pointers
Nidhi Makhijani [Wed, 23 Jul 2014 11:57:01 +0000 (17:27 +0530)]
mpegenccontext: Remove unused dct_unquantize_h261 function pointers

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agofft-test: Make global exptab variable static
Diego Biurrun [Mon, 21 Jul 2014 08:53:16 +0000 (01:53 -0700)]
fft-test: Make global exptab variable static

5 years agompegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used
Diego Biurrun [Tue, 22 Jul 2014 18:10:13 +0000 (11:10 -0700)]
mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

5 years agoavcodec/x86/hevc_deblock: Fix compilation with nasm.
Carl Eugen Hoyos [Tue, 22 Jul 2014 22:51:29 +0000 (00:51 +0200)]
avcodec/x86/hevc_deblock: Fix compilation with nasm.

5 years agoavutil/opt: Fix parsing regression with constants starting with numbers
Michael Niedermayer [Wed, 23 Jul 2014 06:36:24 +0000 (08:36 +0200)]
avutil/opt: Fix parsing regression with constants starting with numbers

Fixes parsing "3dnow"

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add "version <next>:" so people dont add new things to the last release
Michael Niedermayer [Wed, 23 Jul 2014 00:37:26 +0000 (02:37 +0200)]
Changelog: add "version <next>:" so people dont add new things to the last release

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e'
Michael Niedermayer [Tue, 22 Jul 2014 22:34:16 +0000 (00:34 +0200)]
Merge commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e'

* commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e':
  configure: Extend the neon intrinsics check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'
Michael Niedermayer [Tue, 22 Jul 2014 22:29:06 +0000 (00:29 +0200)]
Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'

* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
  fft-test: Comment some #endifs

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'
Michael Niedermayer [Tue, 22 Jul 2014 22:23:15 +0000 (00:23 +0200)]
Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'

* commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5':
  fft-test: Drop unnecessary #ifdefs around header includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: dct/rdft only support float mode, skip their contents for fixed point
Michael Niedermayer [Tue, 22 Jul 2014 21:57:30 +0000 (23:57 +0200)]
avcodec: dct/rdft only support float mode, skip their contents for fixed point

5 years agoMerge commit '11c7155cce50971a38e6cebd39a3ba5a54645fae'
Michael Niedermayer [Tue, 22 Jul 2014 20:40:42 +0000 (22:40 +0200)]
Merge commit '11c7155cce50971a38e6cebd39a3ba5a54645fae'

* commit '11c7155cce50971a38e6cebd39a3ba5a54645fae':
  dct/rdft: Add missing typedefs for context structs

Not merged, as it breaks build

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Extend the neon intrinsics check
Martin Storsjö [Tue, 22 Jul 2014 12:09:43 +0000 (15:09 +0300)]
configure: Extend the neon intrinsics check

Check for an instruction that causes the (very old) Apple GCC 4.2
to error out ("unrecognizable insn").

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'
Michael Niedermayer [Tue, 22 Jul 2014 20:32:40 +0000 (22:32 +0200)]
Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'

* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
  build: Add define for SIMD extensions requiring 16-byte aligned buffers

Conflicts:
configure
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'
Michael Niedermayer [Tue, 22 Jul 2014 20:09:39 +0000 (22:09 +0200)]
Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'

* commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3':
  libxvid: Drop PPC-specific CPU detection hack

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'
Michael Niedermayer [Tue, 22 Jul 2014 20:02:48 +0000 (22:02 +0200)]
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'

* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
  http: Use a constant for the supported header size

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofft-test: Comment some #endifs
Diego Biurrun [Fri, 18 Jul 2014 12:07:30 +0000 (05:07 -0700)]
fft-test: Comment some #endifs

5 years agofft-test: Drop unnecessary #ifdefs around header includes
Diego Biurrun [Fri, 18 Jul 2014 12:06:32 +0000 (05:06 -0700)]
fft-test: Drop unnecessary #ifdefs around header includes

5 years agodct/rdft: Add missing typedefs for context structs
Diego Biurrun [Fri, 18 Jul 2014 13:07:26 +0000 (06:07 -0700)]
dct/rdft: Add missing typedefs for context structs

Without the typedefs there can be trouble depending on #include order.

5 years agobuild: Add define for SIMD extensions requiring 16-byte aligned buffers
Diego Biurrun [Mon, 21 Jul 2014 20:58:55 +0000 (13:58 -0700)]
build: Add define for SIMD extensions requiring 16-byte aligned buffers

5 years agolibxvid: Drop PPC-specific CPU detection hack
Diego Biurrun [Mon, 21 Jul 2014 20:11:40 +0000 (13:11 -0700)]
libxvid: Drop PPC-specific CPU detection hack

It is doubtful if the hack (still) works and Xvid had ten years to fix it.

5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 22 Jul 2014 16:23:49 +0000 (18:23 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Autodetect big-endian tiff files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: wait proper position for tmvp
Christophe Gisquet [Sun, 20 Jul 2014 07:34:58 +0000 (09:34 +0200)]
hevc: wait proper position for tmvp

The position is either rounded or not checked, so delay the wait to
check the proper value.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAutodetect big-endian tiff files.
Carl Eugen Hoyos [Tue, 22 Jul 2014 15:15:20 +0000 (17:15 +0200)]
Autodetect big-endian tiff files.

5 years agoavcodec/mjpegdec: add pix_fmt: 0x14121200
Przemysław Sobala [Tue, 22 Jul 2014 13:52:41 +0000 (15:52 +0200)]
avcodec/mjpegdec: add pix_fmt: 0x14121200

Fixes: _15801_F.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: simplify set_string_number()
Michael Niedermayer [Tue, 22 Jul 2014 15:33:06 +0000 (17:33 +0200)]
avutil/opt: simplify set_string_number()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: set_string_number(): remove unneeded copy
Muhammad Faiz [Tue, 22 Jul 2014 06:39:43 +0000 (23:39 -0700)]
avutil/opt: set_string_number(): remove unneeded copy

also remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohttp: Use a constant for the supported header size
Luca Barbato [Tue, 22 Jul 2014 14:37:09 +0000 (16:37 +0200)]
http: Use a constant for the supported header size

5 years agoavcodec/x86/hevcdsp_init: Fix "warning: assignment from incompatible pointer type"
Michael Niedermayer [Tue, 22 Jul 2014 14:36:12 +0000 (16:36 +0200)]
avcodec/x86/hevcdsp_init: Fix "warning: assignment from incompatible pointer type"

5 years agohevcdsp: remove an unneeded variable in the loop filter
Anton Khirnov [Sat, 19 Jul 2014 12:50:11 +0000 (14:50 +0200)]
hevcdsp: remove an unneeded variable in the loop filter
beta0 and beta1 will always be the same within a CU

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit 4a23d824741a289c7d2d2f2871d1e2621b63fa1b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/hevc_deblock: cosmetics
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
avcodec/x86/hevc_deblock: cosmetics

cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: cleanups in SSE2 and SSSE3 loop filters, use fewer instructions
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
hevc: cleanups in SSE2 and SSSE3 loop filters, use fewer instructions

cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/hevc_deblock: use test instead of cmp 0
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
avcodec/x86/hevc_deblock: use test instead of cmp 0

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