ffmpeg.git
4 years agoMerge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'
Michael Niedermayer [Sun, 10 May 2015 20:50:22 +0000 (22:50 +0200)]
Merge commit '379e5603f4131e677ecf5ba79973dcd5603f28ea'

* commit '379e5603f4131e677ecf5ba79973dcd5603f28ea':
  id3v2: Do not export empty APIC description

Conflicts:
libavformat/id3v2.c

See: b697b297b77f73c932307120e32c187d521d2ff7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b9f7a677083647d85e583d6d7384938766a293d7'
Michael Niedermayer [Sun, 10 May 2015 20:42:23 +0000 (22:42 +0200)]
Merge commit 'b9f7a677083647d85e583d6d7384938766a293d7'

* commit 'b9f7a677083647d85e583d6d7384938766a293d7':
  png: Set the color range as full range

Conflicts:
libavcodec/pngdec.c

See: 72e7553125e61847d9cab77fb7de62440dca746b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'
Michael Niedermayer [Sun, 10 May 2015 20:30:43 +0000 (22:30 +0200)]
Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'

* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
  nut: Make sure to clean up on read_header failure

Conflicts:
libavformat/nutdec.c

See: 361702660d2c37a63b7d6381d39e1e1de8405260
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'
Michael Niedermayer [Sun, 10 May 2015 20:19:01 +0000 (22:19 +0200)]
Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'

* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
  avi: Validate sample_size

Conflicts:
libavformat/avidec.c

See: ca234639ac49a0dc073ac1f10977979acdb94f97
See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
Michael Niedermayer [Sun, 10 May 2015 20:09:26 +0000 (22:09 +0200)]
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'

* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
  nut: Check chapter creation in decode_info_header

Conflicts:
libavformat/nutdec.c

See: 3ff1af2b0db7132d5717be6395227a94c8abab07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'
Michael Niedermayer [Sun, 10 May 2015 20:00:02 +0000 (22:00 +0200)]
Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'

* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
  alac: Reject rice_limit 0 if compression is used

Conflicts:
libavcodec/alac.c

See: 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '295e05a762332c5edcc84c325e94457815a51b5c'
Michael Niedermayer [Sun, 10 May 2015 19:41:31 +0000 (21:41 +0200)]
Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'

* commit '295e05a762332c5edcc84c325e94457815a51b5c':
  ape: Support _0000 files with nblock smaller than 64

Conflicts:
libavcodec/apedec.c

See: 699341d647f7af785fb8ceed67604467b0b9ab12
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/wavenc: Check umid length
Michael Niedermayer [Sun, 10 May 2015 17:54:41 +0000 (19:54 +0200)]
avformat/wavenc: Check umid length

Fixes potential out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/wavenc: fix string length variable types
Michael Niedermayer [Sun, 10 May 2015 17:52:30 +0000 (19:52 +0200)]
avformat/wavenc: fix string length variable types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ppc/h264qpel_template: Fix alignment assert
Michael Niedermayer [Sun, 10 May 2015 16:08:42 +0000 (18:08 +0200)]
avcodec/ppc/h264qpel_template: Fix alignment assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc/postprocess: Use size_t to hold strlen()s value
Michael Niedermayer [Sun, 10 May 2015 14:28:37 +0000 (16:28 +0200)]
postproc/postprocess: Use size_t to hold strlen()s value

This should make no difference but its more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutenc: Fix writing strings larger than 2gb
Michael Niedermayer [Sun, 10 May 2015 14:26:58 +0000 (16:26 +0200)]
avformat/nutenc: Fix writing strings larger than 2gb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/dict: Use size_t for appending strings
Michael Niedermayer [Sun, 10 May 2015 14:09:07 +0000 (16:09 +0200)]
avutil/dict: Use size_t for appending strings

the string length is not constrained to INT_MAX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil/mem: use size_t for the length in av_strdup()
Michael Niedermayer [Sun, 10 May 2015 14:06:50 +0000 (16:06 +0200)]
libavutil/mem: use size_t for the length in av_strdup()

the string length is not constrained to INT_MAX

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/x86/swscale: Fix warning about loosing significant bits in cast
Michael Niedermayer [Sun, 10 May 2015 13:09:04 +0000 (15:09 +0200)]
swscale/x86/swscale: Fix warning about loosing significant bits in cast

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/http: Mark lower_proto as const in http_listen()
Michael Niedermayer [Sun, 10 May 2015 13:01:36 +0000 (15:01 +0200)]
avformat/http: Mark lower_proto as const in http_listen()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxf: Always evaluate PRINT_KEY() arguments at compile time
Michael Niedermayer [Thu, 7 May 2015 01:39:51 +0000 (03:39 +0200)]
avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mxf: Simplify PRINT_KEY()
Michael Niedermayer [Thu, 7 May 2015 01:38:43 +0000 (03:38 +0200)]
avformat/mxf: Simplify PRINT_KEY()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: set dia_size for the first pass of motion estimation too
Michael Niedermayer [Sun, 10 May 2015 02:43:39 +0000 (04:43 +0200)]
avcodec/snowenc: set dia_size for the first pass of motion estimation too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat_alloc_context: initialize raw_packet_buffer_remaining_size.
Reimar Döffinger [Sat, 9 May 2015 18:55:48 +0000 (20:55 +0200)]
avformat_alloc_context: initialize raw_packet_buffer_remaining_size.

This currently works for most users because
avformat_open_input sets it, but this patch fixes any
applications not using that function.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agoavcodec/snowenc: correct fullpel search pattern
Michael Niedermayer [Sun, 10 May 2015 00:26:28 +0000 (02:26 +0200)]
avcodec/snowenc: correct fullpel search pattern

No real difference in quality, its a bit slower for the same dia_size as more
vectors are searched for the same dia_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: Fix used reference MV in fullpel iterative ME
Michael Niedermayer [Sat, 9 May 2015 22:57:06 +0000 (00:57 +0200)]
avcodec/snowenc: Fix used reference MV in fullpel iterative ME

This very very slightly improves quality, no measurable speed change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: change log level for iterative ME information to debug level
Michael Niedermayer [Sat, 9 May 2015 22:46:02 +0000 (00:46 +0200)]
avcodec/snowenc: change log level for iterative ME information to debug level

The printed stuff should be useless to the average user and its certainly
not an error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snowenc: add intra_penalty AVOption
Michael Niedermayer [Sat, 9 May 2015 21:43:43 +0000 (23:43 +0200)]
avcodec/snowenc: add intra_penalty AVOption

This allows favoring intra or inter blocks by a user specified amount.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_fi...
Michael Niedermayer [Sat, 9 May 2015 14:20:12 +0000 (16:20 +0200)]
avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Fix "-flags +gray"
Michael Niedermayer [Sat, 9 May 2015 13:58:02 +0000 (15:58 +0200)]
avcodec/mpeg12dec: Fix "-flags +gray"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoid3v2: Do not export empty APIC description
wm4 [Fri, 8 May 2015 16:19:12 +0000 (18:19 +0200)]
id3v2: Do not export empty APIC description

APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.

4 years agopng: Set the color range as full range
wm4 [Fri, 8 May 2015 15:01:50 +0000 (17:01 +0200)]
png: Set the color range as full range

The format uses full range for the gray formats.

CC: libav-stable@libav.org
4 years agonut: Make sure to clean up on read_header failure
Luca Barbato [Wed, 29 Apr 2015 19:29:49 +0000 (21:29 +0200)]
nut: Make sure to clean up on read_header failure

Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work.

CC: libav-stable@libav.org
4 years agoavi: Validate sample_size
Andreas Cadhalpun [Wed, 6 May 2015 00:26:57 +0000 (02:26 +0200)]
avi: Validate sample_size

And either error out or set it to 0 if it is negative.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agocmdline: Check options array for not working flag combinations
Michael Niedermayer [Sat, 9 May 2015 11:07:21 +0000 (13:07 +0200)]
cmdline: Check options array for not working flag combinations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg_opt: Fix -timestamp parsing
Michael Niedermayer [Sat, 9 May 2015 11:07:00 +0000 (13:07 +0200)]
ffmpeg_opt: Fix -timestamp parsing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Fix indention
Michael Niedermayer [Sat, 9 May 2015 10:02:47 +0000 (12:02 +0200)]
avcodec/mpegvideo: Fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/error_resilience: support grayscale
Michael Niedermayer [Sat, 9 May 2015 00:42:47 +0000 (02:42 +0200)]
avcodec/error_resilience: support grayscale

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpegvideo: Fix -flags +gray with xvid_vlc_trac7411.h263
Michael Niedermayer [Fri, 8 May 2015 23:36:53 +0000 (01:36 +0200)]
avcodec/mpegvideo: Fix -flags +gray with xvid_vlc_trac7411.h263

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAY
Michael Niedermayer [Fri, 8 May 2015 23:10:25 +0000 (01:10 +0200)]
avcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAY

Fixes Ticket4542

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/v4l2: Try to fix build on netbsd/openbsd
Michael Niedermayer [Fri, 8 May 2015 22:27:00 +0000 (00:27 +0200)]
avdevice/v4l2: Try to fix build on netbsd/openbsd

Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/v4l2: produce a 0 byte packet when a dequeued buffer is flagged with V4L2_BUF_FL...
Giorgio Vazzana [Fri, 8 May 2015 15:25:15 +0000 (17:25 +0200)]
lavd/v4l2: produce a 0 byte packet when a dequeued buffer is flagged with V4L2_BUF_FLAG_ERROR

Fixes ticket #4030.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is set
Michael Niedermayer [Fri, 8 May 2015 16:50:28 +0000 (18:50 +0200)]
avcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/v4l2: fix typo
Giorgio Vazzana [Fri, 8 May 2015 15:42:34 +0000 (17:42 +0200)]
lavd/v4l2: fix typo

This was introduced in cde6e328de214ffe8387641cdc1e433a2c2150f3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: de-duplicate some functions that are identical between 10/12 bpp.
Ronald S. Bultje [Thu, 7 May 2015 12:37:37 +0000 (08:37 -0400)]
vp9: de-duplicate some functions that are identical between 10/12 bpp.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: remove loongson check inline asm and mips dependent
周晓勇 [Fri, 8 May 2015 10:17:19 +0000 (18:17 +0800)]
configure: remove loongson check inline asm and mips dependent

1.Loongson now have two series CPU supported MMI(Multi-Media Instruct).
  Loongson-3 designed multi-core have good performance in decoding.
  Loongson-2's support is comming soon.
2.Replaced loongson with loongson2 and loongson3.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: replace arch loongson with arch extra list loongson
周晓勇 [Fri, 8 May 2015 10:16:14 +0000 (18:16 +0800)]
configure: replace arch loongson with arch extra list loongson

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agonut: Check chapter creation in decode_info_header
Andreas Cadhalpun [Tue, 28 Apr 2015 18:57:59 +0000 (20:57 +0200)]
nut: Check chapter creation in decode_info_header

This fixes a segmentation fault when accessing the metadata.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
4 years agoalac: Reject rice_limit 0 if compression is used
Andreas Cadhalpun [Thu, 23 Apr 2015 22:01:43 +0000 (00:01 +0200)]
alac: Reject rice_limit 0 if compression is used

If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.

Request a sample in case it is valid and it should be accepted.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
4 years agoape: Support _0000 files with nblock smaller than 64
Andreas Cadhalpun [Wed, 29 Apr 2015 18:39:22 +0000 (20:39 +0200)]
ape: Support _0000 files with nblock smaller than 64

The decode_array_0000 assumed that 64 is the minimal block size
while it is not.

CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoid3v2: do not export APIC description if empty
wm4 [Thu, 7 May 2015 21:56:36 +0000 (23:56 +0200)]
id3v2: do not export APIC description if empty

APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopngdec: set correct range
wm4 [Thu, 7 May 2015 21:37:18 +0000 (23:37 +0200)]
pngdec: set correct range

AV_PIX_FMT_GRAY8/16 are considered YUV formats, and the color_range is
not set - so the API user will have to assume limitted range. (Unless
the API user adds a special-case for the PNG decoder.)

Just export the correct range - full range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/x86/hscale_fast_bilinear_simd: Remove ancient out-commented debug code
Michael Niedermayer [Thu, 7 May 2015 21:40:22 +0000 (23:40 +0200)]
swscale/x86/hscale_fast_bilinear_simd: Remove ancient out-commented debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: fill missing versions and hashes
James Almer [Thu, 7 May 2015 21:55:43 +0000 (18:55 -0300)]
doc/APIchanges: fill missing versions and hashes

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agovp9: add missing changelog and APIchanges entries for new VP9 profiles
James Almer [Thu, 7 May 2015 21:33:11 +0000 (18:33 -0300)]
vp9: add missing changelog and APIchanges entries for new VP9 profiles

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec/s3tc: fix alpha decoding when dimensions are not a multiple of 4
Tom Butterworth [Thu, 7 May 2015 20:21:46 +0000 (21:21 +0100)]
avcodec/s3tc: fix alpha decoding when dimensions are not a multiple of 4

Fix alpha position error for edge blocks of odd-dimensioned frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/g2meet: Check init_get_bits8() return value
Michael Niedermayer [Thu, 7 May 2015 20:50:39 +0000 (22:50 +0200)]
avcodec/g2meet: Check init_get_bits8() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/g2meet: Use init_get_bits8()
Michael Niedermayer [Thu, 7 May 2015 20:47:56 +0000 (22:47 +0200)]
avcodec/g2meet: Use init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: Use av_packet_side_data_name() to find the side data name
Michael Niedermayer [Thu, 7 May 2015 19:20:26 +0000 (21:20 +0200)]
ffprobe: Use av_packet_side_data_name() to find the side data name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec: Add av_packet_side_data_name()
Michael Niedermayer [Sun, 3 May 2015 01:21:23 +0000 (03:21 +0200)]
avcodec: Add av_packet_side_data_name()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/txd: Fix input size checks for dxt1/3 for dimensions % 4 != 0
Michael Niedermayer [Thu, 7 May 2015 17:11:01 +0000 (19:11 +0200)]
avcodec/txd: Fix input size checks for dxt1/3 for dimensions % 4 != 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/s3tc: fix decoding when dimensions are not a multiple of 4
Tom Butterworth [Thu, 7 May 2015 15:17:10 +0000 (16:17 +0100)]
avcodec/s3tc: fix decoding when dimensions are not a multiple of 4

Image dimensions were rounded down causing rows to wrap early if dimensions were not a multiple of 4.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoaacsbr: break infinite loop in sbr_hf_calc_npatches
Andreas Cadhalpun [Wed, 22 Apr 2015 13:23:24 +0000 (15:23 +0200)]
aacsbr: break infinite loop in sbr_hf_calc_npatches

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni copy, uni horizontal...
Shivraj Patil [Mon, 4 May 2015 12:21:34 +0000 (17:51 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC uni copy, uni horizontal and uni vertical mc functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoripemd: move ripemd{256, 320} into separate functions
James Almer [Thu, 7 May 2015 04:58:50 +0000 (01:58 -0300)]
ripemd: move ripemd{256, 320} into separate functions

This allows the removal of a few branches.

Before:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:    7.052 +- 0.010

After:
lavu       RIPEMD-160   size: 1048576  runs:   1024  time:    6.865 +- 0.015

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/x86/vp9dsp_init: Fix mix of declaration and statement
Michael Niedermayer [Thu, 7 May 2015 11:46:48 +0000 (13:46 +0200)]
avcodec/x86/vp9dsp_init: Fix mix of declaration and statement

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vp9dsp: Replace assert by av_assert0()
Michael Niedermayer [Thu, 7 May 2015 11:44:54 +0000 (13:44 +0200)]
avcodec/vp9dsp: Replace assert by av_assert0()

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'rbultje/vp9-profile23-wip'
Michael Niedermayer [Thu, 7 May 2015 11:21:59 +0000 (13:21 +0200)]
Merge remote-tracking branch 'rbultje/vp9-profile23-wip'

* rbultje/vp9-profile23-wip:
  libvpxdec: add 440 pixfmts.
  vp9: add profile 2/3 fate tests.
  vp9: add inter-frame profile 2/3 suport.
  vp9: add keyframe profile 2/3 support.
  vp9: parse profile 2/3 bitdepth in frame header.
  vp9: add profile 2/3 to exported profiles.
  fate: add/update reference files for 440 addition.
  swscale: add yuv440p10/12 pixfmts.
  lavc: add yuv440p10/12 formats to aligned pixfmt list.
  lavu: add yuv440p10/12 pixfmts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibvpxdec: add 440 pixfmts.
Ronald S. Bultje [Wed, 6 May 2015 19:30:32 +0000 (15:30 -0400)]
libvpxdec: add 440 pixfmts.

4 years agovp9: add profile 2/3 fate tests.
Ronald S. Bultje [Wed, 6 May 2015 15:52:19 +0000 (11:52 -0400)]
vp9: add profile 2/3 fate tests.

4 years agoavcodec/diracdec: Replace default_bsep[] by multiplication
Michael Niedermayer [Thu, 7 May 2015 03:07:55 +0000 (05:07 +0200)]
avcodec/diracdec: Replace default_bsep[] by multiplication

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale/x86/hscale_fast_bilinear_simd: Fix variable names in comments
Michael Niedermayer [Thu, 7 May 2015 01:57:21 +0000 (03:57 +0200)]
swscale/x86/hscale_fast_bilinear_simd: Fix variable names in comments

Found-by: Nick Lewycky <nlewycky@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 6 May 2015 23:59:18 +0000 (01:59 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/img2dec: Autodetect qdraw images.
  lavc/qdrw: Also support real-world qdraw images.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()
Michael Niedermayer [Wed, 6 May 2015 23:21:42 +0000 (01:21 +0200)]
avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/img2dec: Autodetect qdraw images.
Carl Eugen Hoyos [Wed, 6 May 2015 23:10:45 +0000 (01:10 +0200)]
lavf/img2dec: Autodetect qdraw images.

4 years agolavc/qdrw: Also support real-world qdraw images.
Carl Eugen Hoyos [Wed, 6 May 2015 22:51:28 +0000 (00:51 +0200)]
lavc/qdrw: Also support real-world qdraw images.

4 years agoswresample/dither_template: Do not define macro functions to nothing
Michael Niedermayer [Wed, 6 May 2015 23:07:30 +0000 (01:07 +0200)]
swresample/dither_template: Do not define macro functions to nothing

This avoids potential warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/internal: always check arguments of hex_dump_debug()
Michael Niedermayer [Wed, 6 May 2015 22:56:02 +0000 (00:56 +0200)]
avformat/internal: always check arguments of hex_dump_debug()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/asfdec: do not define print_guid() to nothing
Michael Niedermayer [Wed, 6 May 2015 22:54:06 +0000 (00:54 +0200)]
avformat/asfdec: do not define print_guid() to nothing

This avoid potential warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/tableprint_vlc: Do not define functions to nothing
Michael Niedermayer [Wed, 6 May 2015 22:52:47 +0000 (00:52 +0200)]
avcodec/tableprint_vlc: Do not define functions to nothing

This avoids potential warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'
Michael Niedermayer [Wed, 6 May 2015 20:36:34 +0000 (22:36 +0200)]
Merge commit 'e0010bb91fc0b067be8aefd2f77e6838537da433'

* commit 'e0010bb91fc0b067be8aefd2f77e6838537da433':
  mux: Do not leave stale side data pointers in ff_interleave_add_packet()

Conflicts:
libavformat/mux.c

See: bfb3ed1a9d5dafdc185080fdd88d02ff7221d30a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'
Michael Niedermayer [Wed, 6 May 2015 20:29:07 +0000 (22:29 +0200)]
Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'

* commit '6c8c7c246280cdcd23e4d99006b95245ae837278':
  dump: Print AVAudioServiceType side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'
Michael Niedermayer [Wed, 6 May 2015 19:46:48 +0000 (21:46 +0200)]
Merge commit '04070dbca0688ab1e24528ce5c135254a9a79c47'

* commit '04070dbca0688ab1e24528ce5c135254a9a79c47':
  libx265: Fix 'braces around scalar initializer' warning

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd81fb63d87692765c004c19934b49427df434a07'
Michael Niedermayer [Wed, 6 May 2015 19:21:00 +0000 (21:21 +0200)]
Merge commit 'd81fb63d87692765c004c19934b49427df434a07'

* commit 'd81fb63d87692765c004c19934b49427df434a07':
  fate: Add a PICT test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovp9: add inter-frame profile 2/3 suport.
Ronald S. Bultje [Wed, 6 May 2015 15:52:07 +0000 (11:52 -0400)]
vp9: add inter-frame profile 2/3 suport.

4 years agovp9: add keyframe profile 2/3 support.
Ronald S. Bultje [Wed, 6 May 2015 12:50:43 +0000 (08:50 -0400)]
vp9: add keyframe profile 2/3 support.

4 years agovp9: parse profile 2/3 bitdepth in frame header.
Ronald S. Bultje [Tue, 5 May 2015 13:39:13 +0000 (09:39 -0400)]
vp9: parse profile 2/3 bitdepth in frame header.

4 years agovp9: add profile 2/3 to exported profiles.
Ronald S. Bultje [Tue, 5 May 2015 14:04:12 +0000 (10:04 -0400)]
vp9: add profile 2/3 to exported profiles.

4 years agofate: add/update reference files for 440 addition.
Ronald S. Bultje [Wed, 6 May 2015 19:10:26 +0000 (15:10 -0400)]
fate: add/update reference files for 440 addition.

4 years agoMerge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'
Michael Niedermayer [Wed, 6 May 2015 18:52:07 +0000 (20:52 +0200)]
Merge commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d'

* commit '7b734ee55dbb8476d7ad63c7daf55c534cf82d5d':
  lavf: Open PICT images with Quickdraw

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'
Michael Niedermayer [Wed, 6 May 2015 18:40:26 +0000 (20:40 +0200)]
Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'

* commit '34efb8a169e4551326e069be47125c6c2cb7ab90':
  quickdraw: Support direct pixel blocks

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'
Michael Niedermayer [Wed, 6 May 2015 18:32:52 +0000 (20:32 +0200)]
Merge commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f'

* commit 'bb2cb0a66d86ec4ad9f43a488e8b6ab894c22d2f':
  quickdraw: Switch to greedy parsing

Conflicts:
libavcodec/qdrw.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'
Michael Niedermayer [Wed, 6 May 2015 18:23:54 +0000 (20:23 +0200)]
Merge commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'

* commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162':
  quickdraw: Convert to bytestream2

Conflicts:
libavcodec/qdrw.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '01fdfa51aca9086e04bd354fe3f103a49352c085'
Michael Niedermayer [Wed, 6 May 2015 18:08:32 +0000 (20:08 +0200)]
Merge commit '01fdfa51aca9086e04bd354fe3f103a49352c085'

* commit '01fdfa51aca9086e04bd354fe3f103a49352c085':
  xcbgrab: Accept geometries matching the screen size

See: 7971fa9ce0ead8d2e8a79dbe422e91dcef8222ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale: add yuv440p10/12 pixfmts.
Ronald S. Bultje [Tue, 5 May 2015 13:38:15 +0000 (09:38 -0400)]
swscale: add yuv440p10/12 pixfmts.

4 years agolavc: add yuv440p10/12 formats to aligned pixfmt list.
Ronald S. Bultje [Wed, 6 May 2015 16:04:14 +0000 (12:04 -0400)]
lavc: add yuv440p10/12 formats to aligned pixfmt list.

4 years agolavu: add yuv440p10/12 pixfmts.
Ronald S. Bultje [Tue, 5 May 2015 13:37:59 +0000 (09:37 -0400)]
lavu: add yuv440p10/12 pixfmts.

4 years agodiracdec: check that block length is valid
Andreas Cadhalpun [Wed, 6 May 2015 13:34:53 +0000 (15:34 +0200)]
diracdec: check that block length is valid

In init_planes p->xblen and p->yblen are set to:
            p->xblen = s->plane[0].xblen >> s->chroma_x_shift;
            p->yblen = s->plane[0].yblen >> s->chroma_y_shift;

These are later used as block_w and block_h arguments of
s->vdsp.emulated_edge_mc. If one of them is 0 it triggers an av_assert2
in emulated_edge_mc:
    av_assert2(start_x < end_x && block_w > 0);
    av_assert2(start_y < end_y && block_h > 0);

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodirac: use and forward error codes
Andreas Cadhalpun [Wed, 6 May 2015 14:54:40 +0000 (16:54 +0200)]
dirac: use and forward error codes

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/cws2fws: Use a similar implementation in dbgprintf() as in ff_dlog()
Michael Niedermayer [Wed, 6 May 2015 14:09:26 +0000 (16:09 +0200)]
tools/cws2fws: Use a similar implementation in dbgprintf() as in ff_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vp8: Suppress empty body warnings
Michael Niedermayer [Wed, 6 May 2015 14:02:57 +0000 (16:02 +0200)]
avcodec/vp8: Suppress empty body warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomux: Do not leave stale side data pointers in ff_interleave_add_packet()
Michael Niedermayer [Fri, 1 May 2015 22:55:42 +0000 (23:55 +0100)]
mux: Do not leave stale side data pointers in ff_interleave_add_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodump: Print AVAudioServiceType side data
Vittorio Giovara [Fri, 1 May 2015 14:33:50 +0000 (15:33 +0100)]
dump: Print AVAudioServiceType side data

4 years agoavutil/internal: Suppress empty body warning from emms_c()
Michael Niedermayer [Wed, 6 May 2015 13:46:25 +0000 (15:46 +0200)]
avutil/internal: Suppress empty body warning from emms_c()

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