ffmpeg.git
4 years agoMerge commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2'
Michael Niedermayer [Sun, 1 Mar 2015 00:23:32 +0000 (01:23 +0100)]
Merge commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2'

* commit 'f8c01257f93ceda3e03bc4e540a51022d1e2bff2':
  rtpenc: Always do the default initialization regardless of codecs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '11edeaea3293c41ecf577a330422eabba35f76a2'
Michael Niedermayer [Sun, 1 Mar 2015 00:17:24 +0000 (01:17 +0100)]
Merge commit '11edeaea3293c41ecf577a330422eabba35f76a2'

* commit '11edeaea3293c41ecf577a330422eabba35f76a2':
  rtpenc_xiph: Don't exclude headers from max_payload_size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7c1e2e64667421f931ab48141517f19d309c7eea'
Michael Niedermayer [Sun, 1 Mar 2015 00:17:10 +0000 (01:17 +0100)]
Merge commit '7c1e2e64667421f931ab48141517f19d309c7eea'

* commit '7c1e2e64667421f931ab48141517f19d309c7eea':
  rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Conflicts:
libavformat/rtpenc_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'
Michael Niedermayer [Sun, 1 Mar 2015 00:08:00 +0000 (01:08 +0100)]
Merge commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8'

* commit 'd16c8d28d4e2fca3af1054ffbf635c8cee755fc8':
  rtpenc_aac: Use AV_WB16 instead of manual bitshifts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9c9b0218e85fcd969308632f75af48a4ce229541'
Michael Niedermayer [Sun, 1 Mar 2015 00:07:42 +0000 (01:07 +0100)]
Merge commit '9c9b0218e85fcd969308632f75af48a4ce229541'

* commit '9c9b0218e85fcd969308632f75af48a4ce229541':
  rtpenc_aac: Merge a definition with a declaration

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'
Michael Niedermayer [Sun, 1 Mar 2015 00:00:57 +0000 (01:00 +0100)]
Merge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'

* commit '1fc64e2e07787bbca82a72c146588e850e6d098a':
  rtpenc: Write conditional statements on separate lines

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0662440b991361fdb5e732712d997a73e4692e34'
Michael Niedermayer [Sun, 1 Mar 2015 00:00:40 +0000 (01:00 +0100)]
Merge commit '0662440b991361fdb5e732712d997a73e4692e34'

* commit '0662440b991361fdb5e732712d997a73e4692e34':
  rtpenc_aac: Set a default value for max_frames_per_packet at init

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'
Michael Niedermayer [Sat, 28 Feb 2015 23:48:20 +0000 (00:48 +0100)]
Merge commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37'

* commit '12b3459979f5ea6481660cd2c99a0381e2b5ba37':
  rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '98563953442560dd83aab938f86de3e5a22a891f'
Michael Niedermayer [Sat, 28 Feb 2015 23:48:00 +0000 (00:48 +0100)]
Merge commit '98563953442560dd83aab938f86de3e5a22a891f'

* commit '98563953442560dd83aab938f86de3e5a22a891f':
  rtpenc_aac: Fix sending fragmented frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '990e4a6639d0714198583c2812b1074b5751898f'
Michael Niedermayer [Sat, 28 Feb 2015 23:30:20 +0000 (00:30 +0100)]
Merge commit '990e4a6639d0714198583c2812b1074b5751898f'

* commit '990e4a6639d0714198583c2812b1074b5751898f':
  Add a QSV decoding example.

Conflicts:
configure
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21'
Michael Niedermayer [Sat, 28 Feb 2015 23:18:09 +0000 (00:18 +0100)]
Merge commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21'

* commit 'ea1d0b7ece1881c2f1360f8c1e2116791105af21':
  avcodec/utils: use correct printf specifier in ff_set_sar

See: 732c3ebffaff5005367d7f947fa903f3b6e92f68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '802987f8c7033ec8b82b35438d3822cf7f761166'
Michael Niedermayer [Sat, 28 Feb 2015 23:17:36 +0000 (00:17 +0100)]
Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'

* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
  x11grab: Unbreak building

Conflicts:
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
Michael Niedermayer [Sat, 28 Feb 2015 23:06:42 +0000 (00:06 +0100)]
Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'

* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
  lavc: do not compile fmtconvert unconditionally

Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'
Michael Niedermayer [Sat, 28 Feb 2015 22:56:45 +0000 (23:56 +0100)]
Merge commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca'

* commit 'd74a8cb7e42f703be5796eeb485f06af710ae8ca':
  fmtconvert: drop unused functions

Conflicts:
libavcodec/arm/fmtconvert_vfp_armv6.S
libavcodec/x86/fmtconvert.asm
libavcodec/x86/fmtconvert_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ee964145b5d229571e00bf6883a44189d02babe2'
Michael Niedermayer [Sat, 28 Feb 2015 22:41:36 +0000 (23:41 +0100)]
Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'

* commit 'ee964145b5d229571e00bf6883a44189d02babe2':
  lavc: remove unused traces of fmtconvert usage

Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/atrac3.c
libavcodec/vorbisdec.c
libavcodec/wma.c
libavcodec/wma.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'
Michael Niedermayer [Sat, 28 Feb 2015 22:32:33 +0000 (23:32 +0100)]
Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'

* commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919':
  tls: Pass AVOptions dictionaries through to the chained protocol

Conflicts:
libavformat/tls.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'
Michael Niedermayer [Sat, 28 Feb 2015 22:20:39 +0000 (23:20 +0100)]
Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'

* commit 'e14f98c62fdf8744b07419314095d1b3248cce75':
  tcp: Clarify the units for the timeout avoptions

Conflicts:
libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'
Michael Niedermayer [Sat, 28 Feb 2015 22:02:36 +0000 (23:02 +0100)]
Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'

* commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31':
  avio: Rename avclass symbols relating to avio

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvenc: check that the codec_tag fits in the available bits
Andreas Cadhalpun [Sat, 28 Feb 2015 19:58:31 +0000 (20:58 +0100)]
avformat/flvenc: check that the codec_tag fits in the available bits

flags is later written with avio_w8 and if it doesn't fit in one byte it
triggers an av_assert2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/utils: use correct printf specifier in ff_set_sar
Andreas Cadhalpun [Sat, 28 Feb 2015 19:11:36 +0000 (20:11 +0100)]
avcodec/utils: use correct printf specifier in ff_set_sar

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/imgutils: correctly check for negative SAR components
Michael Niedermayer [Sat, 28 Feb 2015 20:57:11 +0000 (21:57 +0100)]
avutil/imgutils: correctly check for negative SAR components

These could trigger assert failures previously

Found-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortpenc: Always do the default initialization regardless of codecs
Martin Storsjö [Thu, 26 Feb 2015 11:33:59 +0000 (13:33 +0200)]
rtpenc: Always do the default initialization regardless of codecs

This avoids having to jump to the defaultcase in the switch. Manually
override the stream time base back to 90 kHz for the few audio codecs
that don't use the sample rate as time base (mp2, mp3).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_xiph: Don't exclude headers from max_payload_size
Martin Storsjö [Thu, 26 Feb 2015 11:39:17 +0000 (13:39 +0200)]
rtpenc_xiph: Don't exclude headers from max_payload_size

This makes things more consistent by using the variable in the same
way as in all other packetizers.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_xiph: Use AV_WB16 instead of manual bitshifts
Martin Storsjö [Thu, 26 Feb 2015 11:42:43 +0000 (13:42 +0200)]
rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_aac: Use AV_WB16 instead of manual bitshifts
Martin Storsjö [Wed, 25 Feb 2015 22:25:11 +0000 (00:25 +0200)]
rtpenc_aac: Use AV_WB16 instead of manual bitshifts

This makes the code slightly more readable and understandable.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_aac: Merge a definition with a declaration
Martin Storsjö [Wed, 25 Feb 2015 22:21:03 +0000 (00:21 +0200)]
rtpenc_aac: Merge a definition with a declaration

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc: Write conditional statements on separate lines
Martin Storsjö [Wed, 25 Feb 2015 21:33:24 +0000 (23:33 +0200)]
rtpenc: Write conditional statements on separate lines

Intentionally keeping some conditional statements on single lines
in rtpenc_h263.c.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_aac: Set a default value for max_frames_per_packet at init
Martin Storsjö [Wed, 25 Feb 2015 21:34:36 +0000 (23:34 +0200)]
rtpenc_aac: Set a default value for max_frames_per_packet at init

This avoids having to conditionally set the default within the
packetizer function.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
Martin Storsjö [Fri, 27 Feb 2015 10:30:54 +0000 (12:30 +0200)]
rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf

This doesn't fix any bug, but makes the code simpler for later
patches, and more straightforward to read as is.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortpenc_aac: Fix sending fragmented frames
Martin Storsjö [Wed, 25 Feb 2015 21:55:58 +0000 (23:55 +0200)]
rtpenc_aac: Fix sending fragmented frames

After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't
zero, while s->num_frames is zero as intended. Using s->num_frames
makes it work as intended, and is less convoluted than keeping track
of (resetting) s->buf_ptr.

This avoids sending stray data after sending a fragmented aac packet.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoAdd a QSV decoding example.
Anton Khirnov [Wed, 11 Feb 2015 23:07:29 +0000 (00:07 +0100)]
Add a QSV decoding example.

4 years agoavcodec/utils: use correct printf specifier in ff_set_sar
Andreas Cadhalpun [Sat, 28 Feb 2015 19:11:36 +0000 (20:11 +0100)]
avcodec/utils: use correct printf specifier in ff_set_sar

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox11grab: Unbreak building
Christian Hujer [Fri, 27 Feb 2015 09:22:08 +0000 (10:22 +0100)]
x11grab: Unbreak building

The correct macro is DEC not D. Broken in
b31328d008985f87f0a7c83c700847cef1a4f08c

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agolavc: do not compile fmtconvert unconditionally
Anton Khirnov [Sat, 21 Feb 2015 10:24:44 +0000 (11:24 +0100)]
lavc: do not compile fmtconvert unconditionally

Only ac3dec and dcadec use it.

4 years agofmtconvert: drop unused functions
Anton Khirnov [Sat, 21 Feb 2015 10:37:52 +0000 (11:37 +0100)]
fmtconvert: drop unused functions

4 years agolavc: remove unused traces of fmtconvert usage
Anton Khirnov [Sat, 21 Feb 2015 10:00:59 +0000 (11:00 +0100)]
lavc: remove unused traces of fmtconvert usage

Those decoders have been switched to float output and so do not use
fmtconvert anymore.

4 years agotls: Pass AVOptions dictionaries through to the chained protocol
Martin Storsjö [Sat, 28 Feb 2015 00:15:55 +0000 (02:15 +0200)]
tls: Pass AVOptions dictionaries through to the chained protocol

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agotcp: Clarify the units for the timeout avoptions
Martin Storsjö [Fri, 27 Feb 2015 23:37:18 +0000 (01:37 +0200)]
tcp: Clarify the units for the timeout avoptions

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavio: Rename avclass symbols relating to avio
Martin Storsjö [Fri, 27 Feb 2015 23:06:28 +0000 (01:06 +0200)]
avio: Rename avclass symbols relating to avio

Don't prefix them ffio_url, which is misleading, sounding too
much like the urlprotocol layer (like ffurl_*).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavcodec/ppc/fdctdsp: fix const warning
Michael Niedermayer [Fri, 27 Feb 2015 22:07:22 +0000 (23:07 +0100)]
avcodec/ppc/fdctdsp: fix const warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: Optimize vc1_decode_i_block_adv()
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Optimize vc1_decode_i_block_adv()

9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1)
13855 -> 10976 decicycles  (fate-suite/vc1/SA20021.vc1)
tests done by the author over this function but with the whole
patchset applied not just this commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: Optimize vc1_decode_i_block()
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Optimize vc1_decode_i_block()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: cosmetics
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: move early exit code up in ff_vc1_pred_dc()
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: move early exit code up in ff_vc1_pred_dc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: Use av_clip_uintp2()
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Use av_clip_uintp2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: Optimize vc1_decode_ac_coeff()
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Optimize vc1_decode_ac_coeff()

Avoid branches in sign handling
Move local variables to where they are used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: Simplify dcdiff initialization
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Simplify dcdiff initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1_block: Simplify dir_ptr / pred initialization
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1_block: Simplify dir_ptr / pred initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: Simplify pred/mc loops
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Simplify pred/mc loops

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: Simplify dmv_y initialization
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Simplify dmv_y initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: Simplify code setting and using extend_x/y
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Simplify code setting and using extend_x/y

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: Make init_block_index() inline
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: Make init_block_index() inline

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: use uint8_t for size_table
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: use uint8_t for size_table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vc1: simplify offset table and access
zhaoxiu.zeng [Tue, 24 Feb 2015 16:28:45 +0000 (00:28 +0800)]
avcodec/vc1: simplify offset table and access

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Fix -vstats when coded_frame is not set
Michael Niedermayer [Mon, 23 Feb 2015 15:43:38 +0000 (16:43 +0100)]
ffmpeg: Fix -vstats when coded_frame is not set

There are several encoders which do not set coded_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavc/pngenc: Support writing colorspace tags.
Niklas Haas [Fri, 27 Feb 2015 20:31:38 +0000 (21:31 +0100)]
lavc/pngenc: Support writing colorspace tags.

These are defined in http://www.w3.org/TR/PNG/#11addnlcolinfo.

4 years agoavformat: Add prefix to get_codec_guid()
Michael Niedermayer [Fri, 27 Feb 2015 18:25:27 +0000 (19:25 +0100)]
avformat: Add prefix to get_codec_guid()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswscale: Add prefix to updateMMXDitherTables()
Michael Niedermayer [Fri, 27 Feb 2015 18:23:46 +0000 (19:23 +0100)]
swscale: Add prefix to updateMMXDitherTables()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: Add prefix to soxr_resampler
Michael Niedermayer [Fri, 27 Feb 2015 18:20:43 +0000 (19:20 +0100)]
swresample: Add prefix to soxr_resampler

also move declaration to header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvdec: Make dv_iweight_720_c static
Michael Niedermayer [Fri, 27 Feb 2015 18:17:23 +0000 (19:17 +0100)]
avcodec/dvdec: Make dv_iweight_720_c static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/v210dec: Add ff prefix to v210_x86_init()
Michael Niedermayer [Fri, 27 Feb 2015 18:08:09 +0000 (19:08 +0100)]
avcodec/v210dec: Add ff prefix to v210_x86_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/h264: Add ff_ prefix to the shared h264_init_dequant_tables() function
Michael Niedermayer [Fri, 27 Feb 2015 17:37:36 +0000 (18:37 +0100)]
avcodec/h264: Add ff_ prefix to the shared h264_init_dequant_tables() function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavf/mov: correct printf specifier
Christophe Gisquet [Fri, 27 Feb 2015 15:10:38 +0000 (16:10 +0100)]
lavf/mov: correct printf specifier

The type is int64_t.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/snow: mark dwt init as av_cold
Michael Niedermayer [Fri, 27 Feb 2015 15:44:11 +0000 (16:44 +0100)]
avcodec/snow: mark dwt init as av_cold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/diracdsp: Mark ff_diracdsp_init() as av_cold
Michael Niedermayer [Fri, 27 Feb 2015 15:39:30 +0000 (16:39 +0100)]
avcodec/diracdsp: Mark ff_diracdsp_init() as av_cold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mjpegenc: Mark ff_mjpeg_encode_close() as av_cold
Michael Niedermayer [Fri, 27 Feb 2015 15:38:08 +0000 (16:38 +0100)]
avcodec/mjpegenc: Mark ff_mjpeg_encode_close() as av_cold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agopostproc: mark alloc/free context functions as av_cold
Michael Niedermayer [Fri, 27 Feb 2015 15:15:31 +0000 (16:15 +0100)]
postproc: mark alloc/free context functions as av_cold

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Write 'colr' box correctly for MP4
Derek Buitenhuis [Thu, 26 Feb 2015 13:47:01 +0000 (13:47 +0000)]
movenc: Write 'colr' box correctly for MP4

This also restricts it to MOV and MP4, since it is only
defined for those formats.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavfilter/palettegen: fix frame mem leak
Clément Bœsch [Fri, 27 Feb 2015 13:18:53 +0000 (14:18 +0100)]
avfilter/palettegen: fix frame mem leak

4 years agoavformat/ffmenc: Use ffio_free_dyn_buf()
Michael Niedermayer [Fri, 27 Feb 2015 12:19:05 +0000 (13:19 +0100)]
avformat/ffmenc: Use ffio_free_dyn_buf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rtpdec_vp9: Use ffio_free_dyn_buf()
Michael Niedermayer [Fri, 27 Feb 2015 12:18:48 +0000 (13:18 +0100)]
avformat/rtpdec_vp9: Use ffio_free_dyn_buf()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/hqx: use init_get_bits8()
Paul B Mahol [Fri, 27 Feb 2015 09:30:13 +0000 (09:30 +0000)]
avcodec/hqx: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/hqx: fix typo
Paul B Mahol [Fri, 27 Feb 2015 08:38:14 +0000 (08:38 +0000)]
avcodec/hqx: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoswscale/utils: clear formatConvBuffer on allocation
Michael Niedermayer [Fri, 27 Feb 2015 02:12:23 +0000 (03:12 +0100)]
swscale/utils: clear formatConvBuffer on allocation

Fixes use of uninitialized memory
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/bit: only accept the g729 codec and 1 channel
Andreas Cadhalpun [Thu, 26 Feb 2015 20:42:02 +0000 (21:42 +0100)]
avformat/bit: only accept the g729 codec and 1 channel

Other codecs/channel numbers are not supported by this muxer.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/bit: check that pkt->size is 10 in write_packet
Andreas Cadhalpun [Thu, 26 Feb 2015 20:38:50 +0000 (21:38 +0100)]
avformat/bit: check that pkt->size is 10 in write_packet

Ohter packet sizes are not supported by this muxer.

This avoids a null pointer dereference of pkt->data.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Thu, 26 Feb 2015 20:38:49 +0000 (21:38 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: notify when the thread message queue blocks.
  ffmpeg: allow to set the thread message queue size.
  lavd/alsa: set frame_size field.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix buffer_size argument to init_put_bits() in multiple encoders.
Dyami Caliri [Thu, 26 Feb 2015 18:17:01 +0000 (10:17 -0800)]
Fix buffer_size argument to init_put_bits() in multiple encoders.

Several encoders were multiplying the buffer size by 8, in order to get
a bit size. However, the buffer_size argument is for the byte size of
the buffer. We had experienced crashes encoding prores (Anatoliy) at
size 4096x4096.

4 years agoavformat/mp3dec: Check for avcodec_alloc_context3() failure
Michael Niedermayer [Thu, 26 Feb 2015 19:11:19 +0000 (20:11 +0100)]
avformat/mp3dec: Check for avcodec_alloc_context3() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mp3dec: properly allocate dummy AVCodecContext
Michael Niedermayer [Thu, 26 Feb 2015 18:59:44 +0000 (19:59 +0100)]
avformat/mp3dec: properly allocate dummy AVCodecContext

Fixes (harmless) use of uninitialized variable

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '82b6e451161f19ab90bfb9565b710021caf5dcbd'
Michael Niedermayer [Thu, 26 Feb 2015 18:36:28 +0000 (19:36 +0100)]
Merge commit '82b6e451161f19ab90bfb9565b710021caf5dcbd'

* commit '82b6e451161f19ab90bfb9565b710021caf5dcbd':
  configure: Move the cross_prefix setting after the toolchain one

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocolormatrix: Accept bt601 aliases as input
Vittorio Giovara [Tue, 24 Feb 2015 18:05:41 +0000 (18:05 +0000)]
colormatrix: Accept bt601 aliases as input

As far as matrix coefficients are concerned, BT470BG and SMPTE170M
match BT601. This is similar to the check performed in vf_scale.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoffmpeg: notify when the thread message queue blocks.
Nicolas George [Mon, 16 Feb 2015 20:53:27 +0000 (21:53 +0100)]
ffmpeg: notify when the thread message queue blocks.

This can help finding the source of A-V desync with live input.

4 years agoffmpeg: allow to set the thread message queue size.
Nicolas George [Wed, 25 Feb 2015 10:50:44 +0000 (11:50 +0100)]
ffmpeg: allow to set the thread message queue size.

4 years agolavd/alsa: set frame_size field.
Nicolas George [Mon, 16 Feb 2015 20:52:03 +0000 (21:52 +0100)]
lavd/alsa: set frame_size field.

The value tells the typical size of a packet from the demuxer.

4 years agomips/acelp_filters: fix incorrect register constraint
James Cowgill [Thu, 26 Feb 2015 13:42:52 +0000 (13:42 +0000)]
mips/acelp_filters: fix incorrect register constraint

Change register constraint on the v variable from = to +. This was causing GCC
to think that the v variable was never read and therefore not initialize it.

This fixes about 20 fate failures on mips64el.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/aacdec: refactor out duplicated assembly code
James Cowgill [Thu, 26 Feb 2015 13:42:47 +0000 (13:42 +0000)]
mips/aacdec: refactor out duplicated assembly code

The float_copy and fmul_and_reverse functions are refactored out from the
multiple copies in this file.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/sbrdsp: remove sbr_neg_odd_64_mips
James Cowgill [Thu, 26 Feb 2015 13:42:46 +0000 (13:42 +0000)]
mips/sbrdsp: remove sbr_neg_odd_64_mips

The optimized C version of this code actually runs faster than this
version, so remove it.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/fft: remove some useless assembly
James Cowgill [Thu, 26 Feb 2015 13:42:45 +0000 (13:42 +0000)]
mips/fft: remove some useless assembly

Remove some assembly that the compiler can easily handle optimally on its own.
GCC produces almost identical assembly.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/aacpsdsp: fix definition of ps_decorrelate_mips
James Cowgill [Thu, 26 Feb 2015 13:42:44 +0000 (13:42 +0000)]
mips/aacpsdsp: fix definition of ps_decorrelate_mips

Q_fract should have be declared as 'const float*'.
Also fix the constness of some local variables affected by this.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomips/mathops: remove 64-bit code
James Cowgill [Thu, 26 Feb 2015 13:42:42 +0000 (13:42 +0000)]
mips/mathops: remove 64-bit code

GCC is perfectly happy generating optimized multiplication code on its own for
64-bit arches. GCC refuses to optimize the loongson code when in 32-bit mode,
so I've left that.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Move the cross_prefix setting after the toolchain one
Luca Barbato [Sun, 6 Apr 2014 22:47:42 +0000 (00:47 +0200)]
configure: Move the cross_prefix setting after the toolchain one

Makes passing to configure
--toolchain=gcc-asan --cross-prefix=armv7a-hardfloat-linux-gnueabi-
work as intended.

4 years agotests: add paletteuse test
Clément Bœsch [Mon, 23 Feb 2015 12:51:15 +0000 (13:51 +0100)]
tests: add paletteuse test

4 years agotests: add palettegen test
Clément Bœsch [Mon, 23 Feb 2015 12:51:06 +0000 (13:51 +0100)]
tests: add palettegen test

4 years agoavfilter/paletteuse: use AV_QSORT()
Clément Bœsch [Thu, 26 Feb 2015 10:31:09 +0000 (11:31 +0100)]
avfilter/paletteuse: use AV_QSORT()

See previous commit for a rationale.

4 years agoavfilter/palettegen: use AV_QSORT()
Clément Bœsch [Wed, 25 Feb 2015 15:06:34 +0000 (16:06 +0100)]
avfilter/palettegen: use AV_QSORT()

This makes the sorting of the colors along an axis (r, g or b)
predictible, and thus testable under FATE. The performance is not really
an issue here since the function is called only once at the end and will
need to sort very small number of entries, so an alternative would be to
make the sorting functions (see DECLARE_CMP_FUNC()) fallback on another
axis in case of equality. This approach was actually simpler.

I don't know if there is any advantage in using a multidimensional sort,
but it will affect the final palette one way or another.

4 years agoavfilter/palettegen: consistently use the same frame for dimensions
Clément Bœsch [Thu, 26 Feb 2015 09:25:53 +0000 (10:25 +0100)]
avfilter/palettegen: consistently use the same frame for dimensions

4 years agoavfilter/palettegen: use a logging context for the dupped color warning
Clément Bœsch [Thu, 26 Feb 2015 09:19:45 +0000 (10:19 +0100)]
avfilter/palettegen: use a logging context for the dupped color warning

4 years agoavfilter/palettegen: export color quantization ratio
Clément Bœsch [Wed, 25 Feb 2015 14:34:13 +0000 (15:34 +0100)]
avfilter/palettegen: export color quantization ratio

4 years agoavformat/adxdec: check avctx->channels for invalid values
Andreas Cadhalpun [Wed, 25 Feb 2015 21:55:44 +0000 (22:55 +0100)]
avformat/adxdec: check avctx->channels for invalid values

This avoids a null pointer dereference of pkt->data.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>