ffmpeg.git
6 years agoffmpeg: support setting the chroma intra matrix
Michael Niedermayer [Mon, 10 Feb 2014 18:02:01 +0000 (19:02 +0100)]
ffmpeg: support setting the chroma intra matrix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: support setting the chroma intra matrix
Michael Niedermayer [Mon, 10 Feb 2014 18:01:41 +0000 (19:01 +0100)]
avcodec: support setting the chroma intra matrix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/exr: read layers
Gonzalo Garramuno [Mon, 17 Feb 2014 17:53:30 +0000 (14:53 -0300)]
avcodec/exr: read layers

EXR files have, like tiffs, multiple channels and layers.  I have a
patch for exr.c that allows you to select the layer you want to process
thru a -layer flag.  It is not bulletproof but works for all layers that
have 3 channels in them (normals, motion vectors, etc).
The calling convention for ffmpeg is:

ffmpeg -layer Diffuse -i myexr.%d.exr test.mov

Here's an exr image with multiple layers:

http://www.datafilehost.com/d/e45d9a1c

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9/x86: set correct number of registers used in intra pred asm
Hendrik Leppkes [Mon, 17 Feb 2014 20:57:42 +0000 (21:57 +0100)]
vp9/x86: set correct number of registers used in intra pred asm

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvdec: use RGB0 for 24bit rgb output instead of BGRA
Michael Niedermayer [Tue, 18 Feb 2014 15:07:54 +0000 (16:07 +0100)]
avcodec/huffyuvdec: use RGB0 for 24bit rgb output instead of BGRA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 18 Feb 2014 14:06:46 +0000 (15:06 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix libswresample compilation with Apple Neon assembler.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvdec: use the correct height field
Michael Niedermayer [Tue, 18 Feb 2014 12:51:25 +0000 (13:51 +0100)]
avcodec/huffyuvdec: use the correct height field

Fixes Ticket3395

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/snow: split block clipping checks
Michael Niedermayer [Tue, 18 Feb 2014 01:53:14 +0000 (02:53 +0100)]
avcodec/snow: split block clipping checks

Fixes out of array read
Fixes: d4476f68ca1c1c57afbc45806f581963-asan_heap-oob_2266b27_8607_cov_4044577381_snow_chroma_bug.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/bink: Check return value of av_add_index_entry()
Michael Niedermayer [Mon, 17 Feb 2014 22:44:49 +0000 (23:44 +0100)]
avformat/bink: Check return value of av_add_index_entry()

Fixes null pointer dereference
Fixes: cdbf15cbd0a27cee958dd0b8800e452e-signal_sigsegv_737991_2083_cov_317652874_LBSTART.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Feb 2014 20:20:38 +0000 (21:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxygen: Replace @parblock syntax with manual linebreaks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'
Michael Niedermayer [Mon, 17 Feb 2014 20:11:29 +0000 (21:11 +0100)]
Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'

* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53':
  doxygen: Add a number of missing function parameter descriptions

Conflicts:
libavformat/avformat.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'
Michael Niedermayer [Mon, 17 Feb 2014 19:59:51 +0000 (20:59 +0100)]
Merge commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e'

* commit '614b9e4db8f3d7c23fc0410fc04745a727a82f4e':
  h264: use avpriv_request_sample for chroma_format_idc

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ansi: fix integer overflow
Michael Niedermayer [Mon, 17 Feb 2014 19:49:42 +0000 (20:49 +0100)]
avcodec/ansi: fix integer overflow

Fixes out of array read
Fixes: 5f9698e86d92f19bb08d54ff0d57027f-signal_sigsegv_b30756_3795_cov_2693691257_ansi256.ans
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp8dsp: evaluate CONFIG_VP7_DECODER/CONFIG_VP8_DECODER
Peter Ross [Sun, 16 Feb 2014 04:34:23 +0000 (15:34 +1100)]
avcodec/vp8dsp: evaluate CONFIG_VP7_DECODER/CONFIG_VP8_DECODER

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix libswresample compilation with Apple Neon assembler.
Reimar Döffinger [Mon, 17 Feb 2014 16:40:10 +0000 (17:40 +0100)]
Fix libswresample compilation with Apple Neon assembler.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agodoxygen: Replace @parblock syntax with manual linebreaks
Diego Biurrun [Sun, 16 Feb 2014 21:09:30 +0000 (22:09 +0100)]
doxygen: Replace @parblock syntax with manual linebreaks

@parblock is only supported in very recent Doxygen versions.

6 years agodoxygen: Add a number of missing function parameter descriptions
Diego Biurrun [Sun, 16 Feb 2014 22:36:31 +0000 (23:36 +0100)]
doxygen: Add a number of missing function parameter descriptions

6 years agotta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}
James Almer [Wed, 12 Feb 2014 01:28:54 +0000 (22:28 -0300)]
tta/x86: add ff_ttafilter_process_dec_{ssse3, sse4}

Results are from a Win64 build running on an AMD FX 6300

1121 decicycles in ttafilter_process_dec_c, 16777112 runs, 104 skips
522 decicycles in ff_ttafilter_process_dec_ssse3, 16777149 runs, 67 skips
477 decicycles in ff_ttafilter_process_dec_sse4, 16777156 runs, 60 skips

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/examples: remove pathes from doxy examples
Michael Niedermayer [Mon, 17 Feb 2014 05:59:59 +0000 (06:59 +0100)]
doc/examples: remove pathes from doxy examples

This makes the examples page less cluttered

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: split decode_coeff_b loop inside txsz branch.
Ronald S. Bultje [Sun, 16 Feb 2014 21:36:51 +0000 (16:36 -0500)]
vp9: split decode_coeff_b loop inside txsz branch.

The advantage of this is that the is32x32 division branch in
decode_coeffs_b is removed from the inner loop to outside the block
coef decoding loop in decode_coeffs. Also, it allows us to merge the
txsz branches from the block coef decoding loop, the context merge
and the context split.

6 years agovp9/x86: intra prediction SIMD.
Ronald S. Bultje [Sun, 16 Feb 2014 18:30:50 +0000 (13:30 -0500)]
vp9/x86: intra prediction SIMD.

Partially based on h264_intrapred. (I hope to eventually merge these
two intrapred implementations back together.)

6 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Mon, 17 Feb 2014 02:18:44 +0000 (03:18 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd: add list devices API
  lavd/opengl_enc_shaders: fix gray* shader

Conflicts:
doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add myself as vf_dejudder.c maintainer
Nicholas Robbins [Sun, 16 Feb 2014 21:02:33 +0000 (16:02 -0500)]
MAINTAINERS: add myself as vf_dejudder.c maintainer

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp8dsp: zeroise input coefficient array after use in vp7 idct functions
Peter Ross [Sun, 16 Feb 2014 04:32:59 +0000 (15:32 +1100)]
avcodec/vp8dsp: zeroise input coefficient array after use in vp7 idct functions

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 17 Feb 2014 01:46:57 +0000 (02:46 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Fix project name typo

Merge for metadata only

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'
Michael Niedermayer [Mon, 17 Feb 2014 00:48:42 +0000 (01:48 +0100)]
Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

* commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90':
  Move all example programs to doc/examples

Conflicts:
configure
doc/Makefile
doc/doxy-wrapper.sh
doc/examples/avcodec.c
doc/examples/decoding_encoding.c
doc/examples/metadata.c
doc/examples/muxing.c
doc/examples/transcode_aac.c
libavcodec/Makefile
libavcodec/api-example.c
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: more completely check the loop filter parameters
Michael Niedermayer [Sun, 16 Feb 2014 23:24:20 +0000 (00:24 +0100)]
avcodec/h264: more completely check the loop filter parameters

Fixes out of array read
Fixes: caa65cc01655505705129b677189f036-signal_sigsegv_fdcc43_2681_cov_3043376737_PPH422I5_Panasonic_A.264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: use avpriv_request_sample for chroma_format_idc
Vittorio Giovara [Sun, 16 Feb 2014 22:07:21 +0000 (23:07 +0100)]
h264: use avpriv_request_sample for chroma_format_idc

6 years agoavcodec/msrle: use av_image_get_linesize() to calculate the linesize
Michael Niedermayer [Sun, 16 Feb 2014 22:08:52 +0000 (23:08 +0100)]
avcodec/msrle: use av_image_get_linesize() to calculate the linesize

Fixes out of array access
Fixes: 14a74a0a2dc67ede543f0e35d834fbbe-asan_heap-oob_49572c_556_cov_215466444_44_001_engine_room.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: Update for new function avio_find_protocol_name
Alexander Strasser [Sun, 16 Feb 2014 19:34:56 +0000 (20:34 +0100)]
doc/APIchanges: Update for new function avio_find_protocol_name

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agoffmpeg_opt: assert_file_overwrite: Work for all file protocol outputs
Alexander Strasser [Sun, 5 Jan 2014 02:06:20 +0000 (03:06 +0100)]
ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputs

Currently the file overwrite check does not work for paths that
contain a colon.

Use avio_find_protocol to always execute the existence check if
the file protocol is going to be used.

Fix remaining part of ticket #3249.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agolavf/avio: Introduce avio_find_protocol_name
Alexander Strasser [Sun, 5 Jan 2014 01:11:18 +0000 (02:11 +0100)]
lavf/avio: Introduce avio_find_protocol_name

Make it possible to find out what protocol will be chosen
for a given URL.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agodoc: Fix project name typo
Diego Biurrun [Sun, 16 Feb 2014 21:08:21 +0000 (22:08 +0100)]
doc: Fix project name typo

6 years agoMove all example programs to doc/examples
Diego Biurrun [Sat, 15 Feb 2014 14:50:29 +0000 (15:50 +0100)]
Move all example programs to doc/examples

Also drop support for building examples in library directories.

6 years agoavcodec/dxtory: fix src size checks
Michael Niedermayer [Sun, 16 Feb 2014 20:12:08 +0000 (21:12 +0100)]
avcodec/dxtory: fix src size checks

Fixes integer overflow
Fixes out of array read
Fixes: d104661bb59b202df7671fb19a00ca6c-asan_heap-oob_d6429d_5066_cov_1729501105_dxtory_mic.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 16 Feb 2014 19:37:18 +0000 (20:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g2meet: validate bpp and bitmasks in the display info

Conflicts:
libavcodec/g2meet.c

See: ae95b2f8103cf0136889884fdf1c4e5136634991
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd: add list devices API
Lukasz Marek [Sun, 16 Feb 2014 19:06:23 +0000 (20:06 +0100)]
lavd: add list devices API

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/opengl_enc_shaders: fix gray* shader
Lukasz Marek [Sun, 16 Feb 2014 18:56:25 +0000 (19:56 +0100)]
lavd/opengl_enc_shaders: fix gray* shader

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoavformat/mov: fix avg_frame_rate calculation
Michael Niedermayer [Sun, 16 Feb 2014 18:05:49 +0000 (19:05 +0100)]
avformat/mov: fix avg_frame_rate calculation

Fixes integer overflow
Fixes Ticket3390

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: adding dejudder filter to remove judder produced by partially telecined material.
Nicholas Robbins [Fri, 14 Feb 2014 21:15:44 +0000 (16:15 -0500)]
lavfi: adding dejudder filter to remove judder produced by partially telecined material.

Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog2meet: validate bpp and bitmasks in the display info
Maxim Poliakovski [Sat, 15 Feb 2014 20:09:22 +0000 (21:09 +0100)]
g2meet: validate bpp and bitmasks in the display info

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
6 years agoavcodec/alsdec: check predictor order against block length
Michael Niedermayer [Sun, 16 Feb 2014 12:12:39 +0000 (13:12 +0100)]
avcodec/alsdec: check predictor order against block length

Fixes out of array access
Fixes: abd3c041acbcb816be113455d138166b-asan_heap-oob_b11634_3707_cov_1707137151_als_05_2ch48k16b.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/fladsp: add missing check to ff_flacdsp_init_x86()
James Almer [Sun, 16 Feb 2014 06:02:47 +0000 (03:02 -0300)]
x86/fladsp: add missing check to ff_flacdsp_init_x86()

Fixes compilation with flac decoder disabled and encoder enabled

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY
Timothy Gu [Fri, 7 Feb 2014 00:20:58 +0000 (16:20 -0800)]
doc/ffmpeg: make the ASCII flow charts narrower to fit onto TTY

These charts in man page are currently destroyed.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec/vorbis: fix stream duration condition
Hendrik Leppkes [Sat, 15 Feb 2014 22:25:33 +0000 (23:25 +0100)]
oggdec/vorbis: fix stream duration condition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 16 Feb 2014 01:24:52 +0000 (02:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Prepare for 10_beta1 Release

Conflicts:
RELEASE

merge only for metadata

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'
Michael Niedermayer [Sun, 16 Feb 2014 01:18:58 +0000 (02:18 +0100)]
Merge commit '9cd4bc41760f8ad879e248920eacbe1e7757152c'

* commit '9cd4bc41760f8ad879e248920eacbe1e7757152c':
  ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'
Michael Niedermayer [Sun, 16 Feb 2014 01:05:29 +0000 (02:05 +0100)]
Merge commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c'

* commit 'c98f3169bfb578c1a4e407b44524f0bfa3b4dc0c':
  lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9c0e4b3395cad79c560d03d2a94595d89e017885'
Michael Niedermayer [Sun, 16 Feb 2014 00:56:15 +0000 (01:56 +0100)]
Merge commit '9c0e4b3395cad79c560d03d2a94595d89e017885'

* commit '9c0e4b3395cad79c560d03d2a94595d89e017885':
  ac3: update AC3PreferredStereoDownmixMode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: set AVFrame format unconditional
Michael Niedermayer [Sun, 16 Feb 2014 00:28:26 +0000 (01:28 +0100)]
avcodec/utils: set AVFrame format unconditional

Fixes inconsistency and out of array accesses
Fixes: 10cdd7e63e7f66e3e66273939e0863dd-asan_heap-oob_1a4ff32_7078_cov_4056274555_mov_h264_aac__mp4box_frag.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: make *ps_id unsigned
Michael Niedermayer [Sat, 15 Feb 2014 22:26:19 +0000 (23:26 +0100)]
avcodec/hevc: make *ps_id unsigned

Fixes integer overflow
Fixes out of array accesses
Fixes 2f65e7dbd02a12f426a423bd7bf880b4-signal_sigsegv_127c952_2793_cov_2517424539_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: Dont turn 32bit timebases into negative numbers
Michael Niedermayer [Sat, 15 Feb 2014 22:09:55 +0000 (23:09 +0100)]
avcodec/hevc: Dont turn 32bit timebases into negative numbers

Fixes assertion failure
Fixes: 499f6ecaeae8e3f79a115a72c61ffd15-asan_static-oob_124a175_2792_cov_1782273879_RPLM_A_qualcomm_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoPrepare for 10_beta1 Release
Reinhard Tartler [Sat, 15 Feb 2014 21:49:04 +0000 (16:49 -0500)]
Prepare for 10_beta1 Release

6 years agoavcodec/hevc_ps: Use get_bits_long() in decode_vui()
Michael Niedermayer [Sat, 15 Feb 2014 21:29:17 +0000 (22:29 +0100)]
avcodec/hevc_ps: Use get_bits_long() in decode_vui()

Fix assertion failure
Fixes: a225222ef88a0f5b1e93e1d0432debc3-asan_static-oob_124a17d_1448_cov_77608227_DBLK_E_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.
Tim Walker [Sat, 15 Feb 2014 17:38:15 +0000 (17:38 +0000)]
ac3dec: set AV_FRAME_DATA_DOWNMIX_INFO side data.

6 years agolavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.
Tim Walker [Sat, 15 Feb 2014 17:12:22 +0000 (17:12 +0000)]
lavu: add AV_FRAME_DATA_DOWNMIX_INFO side data type.

6 years agoac3: update AC3PreferredStereoDownmixMode.
Tim Walker [Sat, 15 Feb 2014 17:12:21 +0000 (17:12 +0000)]
ac3: update AC3PreferredStereoDownmixMode.

'11b' is reserved in the A/52 specification,
but newer encoders use it to indicate a Dolby
Pro Logic II compatible Lt/Rt downmix.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 15 Feb 2014 20:05:31 +0000 (21:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264_parser: use enum values in h264_find_frame_end()

Conflicts:
libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflacdsp_lpc_template: add comment to explain the CONFIG_SMALL code
James Darnley [Fri, 14 Feb 2014 11:40:10 +0000 (12:40 +0100)]
flacdsp_lpc_template: add comment to explain the CONFIG_SMALL code

I found the optimisation of 2 samples per iteration obscured the
underlying algorithm.  I had to write it out on paper and translate into
a mathematical sum to see that the two samples are unconnected.  I hope
that if anyone else is struggling to understand the code that this will
be useful.

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadsp: scan coefficients linearly instead.
Christophe Gisquet [Fri, 14 Feb 2014 16:00:47 +0000 (16:00 +0000)]
dcadsp: scan coefficients linearly instead.

This change is inspired by x86 asm, where this frees a register.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodca: replace some memcpy by AV_COPY128
Christophe Gisquet [Fri, 14 Feb 2014 16:00:49 +0000 (16:00 +0000)]
dca: replace some memcpy by AV_COPY128

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: float dsp: unroll SSE versions
Christophe Gisquet [Fri, 14 Feb 2014 16:00:51 +0000 (16:00 +0000)]
x86: float dsp: unroll SSE versions

vector_fmul and vector_fmac_scalar are guaranteed that they can process in
batch of 16 elements, but their SSE versions only does 8 at a time.

Therefore, unroll them a bit.
299 to 261c for 256 elements in vector_fmac_scalar on Arrandale/Win64.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_parser: use enum values in h264_find_frame_end()
Vittorio Giovara [Fri, 14 Feb 2014 04:20:02 +0000 (05:20 +0100)]
h264_parser: use enum values in h264_find_frame_end()

6 years agoavcodec/fic: clear slice_data
Michael Niedermayer [Sat, 15 Feb 2014 16:19:59 +0000 (17:19 +0100)]
avcodec/fic: clear slice_data

Fixes artifacts
Fixes use of freed memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/fic: fix slice checks
Michael Niedermayer [Sat, 15 Feb 2014 16:19:32 +0000 (17:19 +0100)]
avcodec/fic: fix slice checks

fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/lossless_videodsp: add_hfyu_left_prediction_int16_c: fix harmless integer...
Michael Niedermayer [Sat, 15 Feb 2014 15:51:33 +0000 (16:51 +0100)]
avcodec/lossless_videodsp: add_hfyu_left_prediction_int16_c: fix harmless integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/doxy-wrapper.sh: fix execute flags
Michael Niedermayer [Sat, 15 Feb 2014 15:51:06 +0000 (16:51 +0100)]
doc/doxy-wrapper.sh: fix execute flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/frame_thread_encoder: warn about huffyuv limitations
Michael Niedermayer [Sat, 15 Feb 2014 14:16:51 +0000 (15:16 +0100)]
avcodec/frame_thread_encoder: warn about huffyuv limitations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/frame_thread_encoder: restructure huffyuv checks
Michael Niedermayer [Sat, 15 Feb 2014 14:14:46 +0000 (15:14 +0100)]
avcodec/frame_thread_encoder: restructure huffyuv checks

This makes them similar to the other checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvenc: only allocate stats_out when it will be used
Michael Niedermayer [Sat, 15 Feb 2014 14:06:29 +0000 (15:06 +0100)]
avcodec/huffyuvenc: only allocate stats_out when it will be used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/motion_est: remove unused variable
Lukasz Marek [Fri, 14 Feb 2014 22:20:46 +0000 (23:20 +0100)]
lavc/motion_est: remove unused variable

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/af_compand: do not leak frames on error
Paul B Mahol [Sat, 15 Feb 2014 11:38:32 +0000 (11:38 +0000)]
avfilter/af_compand: do not leak frames on error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/x86/lossless_videodsp: fix w type
Michael Niedermayer [Sat, 15 Feb 2014 05:36:58 +0000 (06:36 +0100)]
avcodec/x86/lossless_videodsp: fix w type

Fixes fate issues on mingw64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 15 Feb 2014 03:05:04 +0000 (04:05 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

Conflicts:
libavfilter/buffersink.h
libavfilter/buffersrc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'
Michael Niedermayer [Sat, 15 Feb 2014 02:48:50 +0000 (03:48 +0100)]
Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'

* commit 'f758ea6e99af6ebd24bbe222898a921c222e5593':
  buffersink: document special error codes returned from av_buffersink_get_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp8dsp: add VP7 idct and loop filter
Peter Ross [Fri, 14 Feb 2014 11:58:17 +0000 (22:58 +1100)]
avcodec/vp8dsp: add VP7 idct and loop filter

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/ffv1enc: add const to silent warning
Lukasz Marek [Fri, 14 Feb 2014 22:21:20 +0000 (23:21 +0100)]
lavc/ffv1enc: add const to silent warning

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/tiff_common: add const to silent warnings
Lukasz Marek [Fri, 14 Feb 2014 22:13:37 +0000 (23:13 +0100)]
lavc/tiff_common: add const to silent warnings

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED
Peter Ross [Fri, 14 Feb 2014 11:57:43 +0000 (22:57 +1100)]
avcodec/h264pred: deconflict DC_128_PRED and HOR_VP8_PRED

Both are required by the VP7 decoder.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group
Anton Khirnov [Mon, 10 Feb 2014 16:25:21 +0000 (17:25 +0100)]
lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group

6 years agobuffersink: document special error codes returned from av_buffersink_get_frame
Anton Khirnov [Tue, 21 May 2013 18:30:36 +0000 (20:30 +0200)]
buffersink: document special error codes returned from av_buffersink_get_frame

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Feb 2014 20:59:56 +0000 (21:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: reduce overreads when loading 8 pixels in altivec dsp functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'
Michael Niedermayer [Fri, 14 Feb 2014 20:49:52 +0000 (21:49 +0100)]
Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0'

* commit '3fbad00714698f59c6326edfcc63db87f525e7c0':
  utvideoenc: Enable support for multiple slices and use them

Conflicts:
libavcodec/utvideoenc.c
tests/fate/utvideo.mak

See: efec857c9f70113bdbcc18e03a5bcadcdca9f9a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutvideoenc: Enable support for multiple slices and use them
Jan Ekström [Fri, 14 Feb 2014 12:48:19 +0000 (14:48 +0200)]
utvideoenc: Enable support for multiple slices and use them

The official Ut Video decoder only threads with slices, thus until
now any files encoded by the libavcodec encoder have only been
decodable with a single thread. The default slice count is now
set to subsampled_height / 120.

Also sets slices to 1 for the Ut Video encoder tests to keep them
green.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34'
Michael Niedermayer [Fri, 14 Feb 2014 20:36:02 +0000 (21:36 +0100)]
Merge commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34'

* commit '4127e6aeb6e9ef53f5acf06e99c06f4b2c0cce34':
  libx265: Remove redundant default param call

See: 25bc8390bb5013eb6f32dcbc28bb420135f3f1f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '41836c4e306e572ecf80d5a714aaec532c7ece60'
Michael Niedermayer [Fri, 14 Feb 2014 20:21:31 +0000 (21:21 +0100)]
Merge commit '41836c4e306e572ecf80d5a714aaec532c7ece60'

* commit '41836c4e306e572ecf80d5a714aaec532c7ece60':
  libx265: Fix use of uninitialized input picture

See: 955544e4d031bd8435cf8f55bdbfe1d0ede01469
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: skip the MPEG-2 style dts/pts code for HEVC
Michael Niedermayer [Fri, 14 Feb 2014 19:34:53 +0000 (20:34 +0100)]
avformat/utils: skip the MPEG-2 style dts/pts code for HEVC

This extends the exception from H264 to H264 + HEVC

Fixes Ticket3385

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: improve guess_correct_pts() by considerng mixed dts/pts use caused...
Michael Niedermayer [Fri, 14 Feb 2014 19:27:07 +0000 (20:27 +0100)]
avcodec/utils: improve guess_correct_pts() by considerng mixed dts/pts use caused by NOPTSs

No testcase known, this is a theoretical improvment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoppc: reduce overreads when loading 8 pixels in altivec dsp functions
Janne Grunau [Thu, 13 Feb 2014 11:27:17 +0000 (12:27 +0100)]
ppc: reduce overreads when loading 8 pixels in altivec dsp functions

Altivec can only load naturally aligned vectors. To handle possibly
unaligned data a second vector is loaded from an offset of the original
location and the data is recovered through a vector permutation.
Overreads are minimal if the offset for second load points to the last
element of data. This is 7 for loading eight 8-bit pixels and overreads
are reduced from 16 bytes to 8 bytes if the pixels are 64-bit aligned.
For unaligned pixels the overread is reduced from 23 bytes to 15 bytes
in the worst case.

6 years agoMAINTAINERS: add myself as ffserver maintainer
Reynaldo H. Verdejo Pinochet [Fri, 14 Feb 2014 17:30:09 +0000 (14:30 -0300)]
MAINTAINERS: add myself as ffserver maintainer

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: merge RTSP's teardown & pause routines
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 18:03:52 +0000 (15:03 -0300)]
ffserver: merge RTSP's teardown & pause routines

They were basically the same.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: cosmetics
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 07:11:01 +0000 (04:11 -0300)]
ffserver: cosmetics

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: fix some comments
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 07:10:11 +0000 (04:10 -0300)]
ffserver: fix some comments

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: factor out connection closing from handler
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 06:24:16 +0000 (03:24 -0300)]
ffserver: factor out connection closing from handler

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: avoid useless substitution
Reynaldo H. Verdejo Pinochet [Thu, 13 Feb 2014 05:37:39 +0000 (02:37 -0300)]
ffserver: avoid useless substitution

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agodoc/filters/histogram: copyedit for grammar
Werner Robitza [Mon, 10 Feb 2014 17:16:36 +0000 (18:16 +0100)]
doc/filters/histogram: copyedit for grammar

There were a few grammar and spelling mistakes in this filter
description. I went through it and corrected them without changing
the meaning.

6 years agoutvideoenc: Enable support for multiple slices and use them
Jan Ekström [Fri, 14 Feb 2014 11:48:56 +0000 (12:48 +0100)]
utvideoenc: Enable support for multiple slices and use them

The official Ut Video decoder only threads with slices, thus until
now any files encoded by the libavcodec encoder have only been
decodable with a single thread. The default slice count is now
set to subsampled_height / 120.

Also sets slices to 1 for the Ut Video encoder tests to keep them
green.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 14 Feb 2014 14:31:14 +0000 (15:31 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/examples: misc Doxygen markup improvements

Conflicts:
doc/examples/muxing.c
doc/examples/transcode_aac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx265: Remove redundant default param call
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:24 +0000 (20:49 +0000)]
libx265: Remove redundant default param call

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Fix use of uninitialized input picture
Derek Buitenhuis [Thu, 13 Feb 2014 20:49:05 +0000 (20:49 +0000)]
libx265: Fix use of uninitialized input picture

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>