]> git.sesse.net Git - ffmpeg/log
ffmpeg
9 years agoswr: Remember previously set int_sample_format from user
Michael Niedermayer [Mon, 22 Jun 2015 16:27:27 +0000 (18:27 +0200)]
swr: Remember previously set int_sample_format from user

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswresample/swresample: Clear delayed_samples_fixup in clear_context()
Michael Niedermayer [Mon, 22 Jun 2015 16:23:44 +0000 (18:23 +0200)]
swresample/swresample: Clear delayed_samples_fixup in clear_context()

This probably makes no difference but its more proper

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/file: implement move and delete callbacks
Mariusz Szczepańczyk [Sat, 20 Jun 2015 12:52:49 +0000 (14:52 +0200)]
lavf/file: implement move and delete callbacks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/avio: Extend API with avio_move() and avio_delete()
Mariusz Szczepańczyk [Wed, 17 Jun 2015 18:12:00 +0000 (20:12 +0200)]
lavf/avio: Extend API with avio_move() and avio_delete()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '61dc9d647c6664e11674d9a10fdde29987d6acda'
Michael Niedermayer [Mon, 22 Jun 2015 10:37:29 +0000 (12:37 +0200)]
Merge commit '61dc9d647c6664e11674d9a10fdde29987d6acda'

* commit '61dc9d647c6664e11674d9a10fdde29987d6acda':
  udp: Fix local_port management

Conflicts:
libavformat/udp.c

See: 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoudp: Fix local_port management
Luca Barbato [Sun, 29 Mar 2015 13:19:35 +0000 (15:19 +0200)]
udp: Fix local_port management

The default value for unset is -1, not 0.

Problem introduced in 66028b7ba6b411ba12ef553e9c8f1f4a4fe27710

9 years agoavcodec/jpeg2000: Move L band scaling from the 9/7f wavelet to quantization stage
Michael Niedermayer [Mon, 22 Jun 2015 00:46:35 +0000 (02:46 +0200)]
avcodec/jpeg2000: Move L band scaling from the 9/7f wavelet to quantization stage

This reduces the number of operations
Its not done for 9/7i as that would overflow thanks to JPEG2000 allowing
32 decomposition levels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: use 32x32->64 multiplies in the 9/7i DWT
Michael Niedermayer [Mon, 22 Jun 2015 00:22:36 +0000 (02:22 +0200)]
avcodec/jpeg2000dwt: use 32x32->64 multiplies in the 9/7i DWT

This significantly improves the quality when the integer 9/7 transform
is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000: Move H band scaling from wavelet into quantization code
Michael Niedermayer [Sun, 21 Jun 2015 23:56:06 +0000 (01:56 +0200)]
avcodec/jpeg2000: Move H band scaling from wavelet into quantization code

This reduces the number of operations done and is equivalent except for
rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Move K/X constants to header
Michael Niedermayer [Sun, 21 Jun 2015 23:54:51 +0000 (01:54 +0200)]
avcodec/jpeg2000dwt: Move K/X constants to header

this makes them accessible by the rest of the jpeg2000 code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000: Move gainb handling into the quantization code
Michael Niedermayer [Sun, 21 Jun 2015 23:30:33 +0000 (01:30 +0200)]
avcodec/jpeg2000: Move gainb handling into the quantization code

thats how the specification defines it, this also improves numerical
accuracy of the integer wavelet implementation. It otherwise should
be equivalent, in case of overflows this can be reverted.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:57:13 +0000 (18:57 -0300)]
ffserver: drop unneeded else branching

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:43:13 +0000 (18:43 -0300)]
ffserver: drop unneeded else branching

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:28:22 +0000 (18:28 -0300)]
ffserver: drop unneeded else branching

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: formating
Reynaldo H. Verdejo Pinochet [Sun, 21 Jun 2015 21:19:09 +0000 (18:19 -0300)]
ffserver: formating

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoswresample: soxr implementation for swr_get_out_samples()
Rob Sykes [Sun, 21 Jun 2015 19:45:50 +0000 (19:45 +0000)]
swresample: soxr implementation for swr_get_out_samples()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'
Michael Niedermayer [Sun, 21 Jun 2015 19:48:44 +0000 (21:48 +0200)]
Merge commit '8655c54160767de1a6b96f8bc310d6e4eaceff48'

* commit '8655c54160767de1a6b96f8bc310d6e4eaceff48':
  libvpx: Support the vp9 extended profiles

Conflicts:
Changelog
configure
libavcodec/libvpx.c
libavcodec/libvpx.h
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c
libavcodec/version.h

mostly not merged, as requested by jamrial

See: 01e59d48ed1a41b88107ed1d4d56ae0cbcd1a60e
See: 079b7f6eacc09bc2813fc1ddc230ab05022b69c2 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'
Michael Niedermayer [Sun, 21 Jun 2015 19:07:10 +0000 (21:07 +0200)]
Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'

* commit '05bf3f54e6078716f6267df530bf1d474ca3d606':
  libvpx: Do not set vp8 only parameters when encoding in vp9

Conflicts:
libavcodec/libvpxenc.c

See: 238ec505e263e7d0363798a05c1c28f494a6300a
See: ae330070ee8b985abb011835502b03baacfbb18c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'
Michael Niedermayer [Sun, 21 Jun 2015 18:54:38 +0000 (20:54 +0200)]
Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'

* commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498':
  af_resample: Set the number of samples in the last frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'
Michael Niedermayer [Sun, 21 Jun 2015 17:41:40 +0000 (19:41 +0200)]
Merge commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77'

* commit '6ec688e1bc76dd93151cbca1c340162ae4b10d77':
  mp3: enable packed main_data decoding in MP4

Conflicts:
libavcodec/mpegaudiodec_template.c

Only the parts needed to support the available sample are merged
the remaining error checks are left in place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Fix value of F_LFTG_X and I_LFTG_X
Michael Niedermayer [Sun, 21 Jun 2015 13:55:42 +0000 (15:55 +0200)]
avcodec/jpeg2000dwt: Fix value of F_LFTG_X and I_LFTG_X

Even if the jpeg2000 spec uses a wrong value this does not
make mathematics work this way, also this has been corrected in the 2004
version AFAIK

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswresample/swresample: Print used int_sample_fmt
Michael Niedermayer [Sun, 21 Jun 2015 16:08:19 +0000 (18:08 +0200)]
swresample/swresample: Print used int_sample_fmt

Suggested-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswresample: Choose 16bit internally only if input and output is 16bit or less
Michael Niedermayer [Sun, 21 Jun 2015 14:29:09 +0000 (16:29 +0200)]
swresample: Choose 16bit internally only if input and output is 16bit or less

or if no rematrix and no resampling is performed and the input is 16bit
note reampling and rematrix itself always use more than 16bit internally
the "internal" sampling format is the format between these steps

Its unlikely the difference from this commit is audible in any case
unless there is some bug either before or after the change.
but multiple people prefer this and it slightly improves the precission
of computations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: also test 9/7 float DWT
Michael Niedermayer [Sun, 21 Jun 2015 13:51:48 +0000 (15:51 +0200)]
avcodec/jpeg2000dwt: also test 9/7 float DWT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibvpx: Support the vp9 extended profiles
Luca Barbato [Thu, 11 Jun 2015 14:56:31 +0000 (16:56 +0200)]
libvpx: Support the vp9 extended profiles

Bump the minimum libvpx version to 1.3.0 and rework the configure logic
to fail only if no decoders and encoders are found.

Based on the original patch from Vittorio.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoavcodec/jpeg2000dwt: List differences for DWT test
Michael Niedermayer [Sun, 21 Jun 2015 11:22:38 +0000 (13:22 +0200)]
avcodec/jpeg2000dwt: List differences for DWT test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: increase the number of test iterations
Michael Niedermayer [Sun, 21 Jun 2015 11:13:00 +0000 (13:13 +0200)]
avcodec/jpeg2000dwt: increase the number of test iterations

the code had too little coverage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Also test 9/7 integer DWT
Michael Niedermayer [Sun, 21 Jun 2015 11:02:34 +0000 (13:02 +0200)]
avcodec/jpeg2000dwt: Also test 9/7 integer DWT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Allow testing with a maximum allowed difference
Michael Niedermayer [Sun, 21 Jun 2015 11:01:17 +0000 (13:01 +0200)]
avcodec/jpeg2000dwt: Allow testing with a maximum allowed difference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/brstm: support little-endian s16 PCM
Paul B Mahol [Sun, 21 Jun 2015 10:21:20 +0000 (10:21 +0000)]
avformat/brstm: support little-endian s16 PCM

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agolavc/adpcm: THP: don't use the ADPC/SEEK table when not seeking
Rodger Combs [Sat, 20 Jun 2015 10:01:27 +0000 (05:01 -0500)]
lavc/adpcm: THP: don't use the ADPC/SEEK table when not seeking

This is almost certainly closer to how the actual Nintendo players work,
and fixes some output pops in files with blank ADPC/SEEK tables (like
those from brawlcustommusic).

9 years agolavf/brstm: handle a BFSTM endianness oddity
Rodger Combs [Sat, 20 Jun 2015 10:01:26 +0000 (05:01 -0500)]
lavf/brstm: handle a BFSTM endianness oddity

9 years agolavf/brstm: add support for seeking
Rodger Combs [Sat, 20 Jun 2015 10:01:21 +0000 (05:01 -0500)]
lavf/brstm: add support for seeking

9 years agolavf/brstm: cleanup; fix short-block demuxing
Rodger Combs [Sat, 20 Jun 2015 10:01:20 +0000 (05:01 -0500)]
lavf/brstm: cleanup; fix short-block demuxing

9 years agolavf/brstm: move bfstm var to a local
Rodger Combs [Sat, 20 Jun 2015 10:01:19 +0000 (05:01 -0500)]
lavf/brstm: move bfstm var to a local

9 years agoavformat/rawenc: Store sample number for ADX
Michael Niedermayer [Sat, 20 Jun 2015 22:32:09 +0000 (00:32 +0200)]
avformat/rawenc: Store sample number for ADX

Fixes Ticket4540

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport demuxing 4gv codec stored in qcp files
Paul B Mahol [Fri, 12 Jun 2015 15:49:50 +0000 (15:49 +0000)]
Support demuxing 4gv codec stored in qcp files

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoffmpeg_opt: Fix handling of creation_time now
Michael Niedermayer [Sun, 21 Jun 2015 02:52:08 +0000 (04:52 +0200)]
ffmpeg_opt: Fix handling of creation_time now

Fixes Ticket4495

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/movenc: Check return code of ff_iso8601_to_unix_time()
Michael Niedermayer [Sun, 21 Jun 2015 02:18:08 +0000 (04:18 +0200)]
avformat/movenc: Check return code of ff_iso8601_to_unix_time()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material
Michael Niedermayer [Sun, 21 Jun 2015 00:39:38 +0000 (02:39 +0200)]
avcodec/mjpegdec: dont try to combine fields for decimated multiscope 2 material

Fixes Ticket4535

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibvpxenc: support setting colorspace for vp9
James Zern [Sat, 13 Jun 2015 19:27:48 +0000 (12:27 -0700)]
libvpxenc: support setting colorspace for vp9

the vp9 bitstream supports 8 values:
unknown (default), bt601, bt709, smpte170, smpte240, bt2020, reserved
and sRGB.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
9 years agolavc/adpcm: THP: fix indentation
Rodger Combs [Sat, 20 Jun 2015 10:01:18 +0000 (05:01 -0500)]
lavc/adpcm: THP: fix indentation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mqcenc: Remove unused variable
Michael Niedermayer [Sat, 20 Jun 2015 20:36:15 +0000 (22:36 +0200)]
avcodec/mqcenc: Remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.
Simon Thelen [Sat, 20 Jun 2015 16:52:50 +0000 (18:52 +0200)]
libavfilter/formats: Fix parsing of channel specifications with a trailing 'c'.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc/adpcm: THP: allow channel counts up to 10
Rodger Combs [Sat, 20 Jun 2015 10:01:17 +0000 (05:01 -0500)]
lavc/adpcm: THP: allow channel counts up to 10

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/brstm: allow larger block sizes
Rodger Combs [Sat, 20 Jun 2015 10:01:16 +0000 (05:01 -0500)]
lavf/brstm: allow larger block sizes

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/brstm: support little-endian files (BCSTM; 3DS)
Rodger Combs [Sat, 20 Jun 2015 10:01:15 +0000 (05:01 -0500)]
lavf/brstm: support little-endian files (BCSTM; 3DS)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc/adpcm: THP: handle packets with sample counts not divisible by 14
Rodger Combs [Sat, 20 Jun 2015 10:01:13 +0000 (05:01 -0500)]
lavc/adpcm: THP: handle packets with sample counts not divisible by 14

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: add little-endian ADPCM_THP decoder
Rodger Combs [Sat, 20 Jun 2015 10:01:14 +0000 (05:01 -0500)]
lavc: add little-endian ADPCM_THP decoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: add avfilter/formats-test
Michael Niedermayer [Sat, 20 Jun 2015 12:07:44 +0000 (14:07 +0200)]
fate: add avfilter/formats-test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/formats: Add test for ff_parse_channel_layout()
Michael Niedermayer [Sat, 20 Jun 2015 12:01:22 +0000 (14:01 +0200)]
avfilter/formats: Add test for ff_parse_channel_layout()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Replace TPsot check by assert
Michael Niedermayer [Sat, 20 Jun 2015 02:42:50 +0000 (04:42 +0200)]
avcodec/jpeg2000dec: Replace TPsot check by assert

The condition is impossible now.
the TPsot type is changed to unsigned int to prevent gcc from producing warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Increase tile part limit to 256
Michael Niedermayer [Sat, 20 Jun 2015 02:38:31 +0000 (04:38 +0200)]
avcodec/jpeg2000dec: Increase tile part limit to 256

This is the maximum that the syntax of jpeg2000 is capable to store

Fixes Ticket4639

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibvpx: Do not set vp8 only parameters when encoding in vp9
Luca Barbato [Tue, 16 Jun 2015 01:48:00 +0000 (03:48 +0200)]
libvpx: Do not set vp8 only parameters when encoding in vp9

9 years agoaf_resample: Set the number of samples in the last frame
Luca Barbato [Fri, 1 Aug 2014 23:58:07 +0000 (01:58 +0200)]
af_resample: Set the number of samples in the last frame

Otherwise trailing zeroes would appear.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agomp3: enable packed main_data decoding in MP4
nu774 [Fri, 9 May 2014 14:05:42 +0000 (23:05 +0900)]
mp3: enable packed main_data decoding in MP4

14496-3 suggests packing main_data of MP3 that is usually scattered
into multiple frames due to bit reservoir.

However, after packing main_data into a access unit, bitrate index
in the MPEG audio frame header doesn't match with actual frame size.

In order to accept this, this patch removes unnecessary frame size
checking on mp3 decoder.

Also, mov demuxer was changed to use MP3 parser only on special cases
(QT MOV with specific sample description) to avoid re-packetizing.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoavutil/fixed_dsp: remove ff_ prefix from static function
James Almer [Sat, 20 Jun 2015 06:36:39 +0000 (03:36 -0300)]
avutil/fixed_dsp: remove ff_ prefix from static function

Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavcodec/jpeg2000dwt: Fill array using 2d instead of 1d accesses
Michael Niedermayer [Sat, 20 Jun 2015 00:11:56 +0000 (02:11 +0200)]
avcodec/jpeg2000dwt: Fill array using 2d instead of 1d accesses

Avoids gcc warning

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Factor dwt test code out so it can be easily used with the other...
Michael Niedermayer [Fri, 19 Jun 2015 23:45:18 +0000 (01:45 +0200)]
avcodec/jpeg2000dwt: Factor dwt test code out so it can be easily used with the other dwts too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Fix special cases in sd_1d53()
Michael Niedermayer [Fri, 19 Jun 2015 23:40:17 +0000 (01:40 +0200)]
avcodec/jpeg2000dwt: Fix  special cases in sd_1d53()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotests/fate: Add fate-j2k-dwt
Michael Niedermayer [Fri, 19 Jun 2015 23:27:27 +0000 (01:27 +0200)]
tests/fate: Add fate-j2k-dwt

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: add test for the 5/3 wavelet
Michael Niedermayer [Fri, 19 Jun 2015 23:24:08 +0000 (01:24 +0200)]
avcodec/jpeg2000dwt: add test for the 5/3 wavelet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Fix order of operations in integer decomposition wavelets
Michael Niedermayer [Fri, 19 Jun 2015 22:41:12 +0000 (00:41 +0200)]
avcodec/jpeg2000dwt: Fix order of operations in integer decomposition wavelets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/j2kenc: Use JP2 format by default
Michael Niedermayer [Fri, 19 Jun 2015 03:13:59 +0000 (05:13 +0200)]
avcodec/j2kenc: Use JP2 format by default

Without the JP2 fields its not possible to identify the colorspace

Fixes Ticket538

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/j2kenc: Support writing JP2 encapsulation
Michael Niedermayer [Fri, 19 Jun 2015 03:13:58 +0000 (05:13 +0200)]
avcodec/j2kenc: Support writing JP2 encapsulation

The added option matches openjpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/dpxenc: implement write16/32 as functions
Michael Niedermayer [Fri, 19 Jun 2015 14:46:06 +0000 (16:46 +0200)]
avcodec/dpxenc: implement write16/32 as functions

Fixes undefined behavior and segfault

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/avstring: Do not print NULL
Michael Niedermayer [Fri, 19 Jun 2015 13:57:32 +0000 (15:57 +0200)]
avutil/avstring: Do not print NULL

Fixes segfault
Fixes Ticket4452

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for hpel functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:24 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for hpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for hpel functions in new file hpeldsp_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/fic: Add skip_cursor AVOption
Michael Niedermayer [Thu, 18 Jun 2015 10:28:29 +0000 (12:28 +0200)]
avcodec/fic: Add skip_cursor AVOption

Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibrary.mak: Workaround SDL redefining main and breaking fate tests on mingw
James Almer [Fri, 19 Jun 2015 10:11:16 +0000 (12:11 +0200)]
library.mak: Workaround SDL redefining main and breaking fate tests on mingw

Fixes Ticket3368

Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/j2kenc: YUV should not use the ICT
Michael Niedermayer [Fri, 19 Jun 2015 02:51:59 +0000 (04:51 +0200)]
avcodec/j2kenc: YUV should not use the ICT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/crc: Fix type of p table so its content fits without overflwoing
Michael Niedermayer [Fri, 19 Jun 2015 00:16:49 +0000 (02:16 +0200)]
avutil/crc: Fix type of p table so its content fits without overflwoing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/avstring: Fix undefined shift
Michael Niedermayer [Fri, 19 Jun 2015 00:13:08 +0000 (02:13 +0200)]
avutil/avstring: Fix undefined shift

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/aes: Fix types
Michael Niedermayer [Fri, 19 Jun 2015 00:11:40 +0000 (02:11 +0200)]
avutil/aes: Fix types

Fixes "warning: argument #2 is incompatible with prototype:"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/adler32: Fix data type in test code
Michael Niedermayer [Fri, 19 Jun 2015 00:09:50 +0000 (02:09 +0200)]
avutil/adler32: Fix data type in test code

Fixes "warning: argument #2 is incompatible with prototype:"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/fft-test: fix type of cpuflags
Michael Niedermayer [Fri, 19 Jun 2015 00:08:06 +0000 (02:08 +0200)]
avcodec/fft-test: fix type of cpuflags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopostproc: fix unaligned access
Andreas Cadhalpun [Thu, 18 Jun 2015 18:15:12 +0000 (20:15 +0200)]
postproc: fix unaligned access

QP_store is only 8-bit-aligned, so accessing it as uint32_t causes
SIGBUS crashes on sparc.
The AV_RN32/AV_WN32 macros only do unaligned access in the
HAVE_FAST_UNALIGNED case.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years agovp9: don't retain NULL as segmentation_map
Andreas Cadhalpun [Wed, 17 Jun 2015 17:02:15 +0000 (19:02 +0200)]
vp9: don't retain NULL as segmentation_map

This fixes segmentation faults, which were introduced in commit
4ba8f327.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years agoavformat: clarify what package needs to be compiled with SSL support
wm4 [Thu, 18 Jun 2015 18:36:19 +0000 (20:36 +0200)]
avformat: clarify what package needs to be compiled with SSL support

Try to reduce user confusion.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoid3v2: strip trailing spaces from APIC tag
wm4 [Thu, 7 May 2015 21:56:37 +0000 (23:56 +0200)]
id3v2: strip trailing spaces from APIC tag

The APIC description must be unique, and some ID3v2 tag writers add
spaces to write several APIC entries with the same description. The
trailing spaces simply serve as a way to disambiguate the description.
Do this so that API users do not have to special-case mp3 to fix this
cosmetic issue.

Requested-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/id3v2: detect PNG by header instead of mime
Michael Niedermayer [Thu, 18 Jun 2015 16:37:39 +0000 (18:37 +0200)]
avformat/id3v2: detect PNG by header instead of mime

the mimetype for PNG can be set to jpeg

Fixes 01\ -\ Cider\ Time.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/hevc_ps: Only discard overread VPS if a previous is available
Michael Niedermayer [Thu, 18 Jun 2015 16:03:21 +0000 (18:03 +0200)]
avcodec/hevc_ps: Only discard overread VPS if a previous is available

Fixes Ticket4621

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/libx264: Avoid reconfig on equivalent aspect ratios
Michael Niedermayer [Thu, 18 Jun 2015 12:40:11 +0000 (14:40 +0200)]
avcodec/libx264: Avoid reconfig on equivalent aspect ratios

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for qpel functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:23 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for qpel functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for qpel functions in new file qpeldsp_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Free last_frame instead of just unref
Michael Niedermayer [Thu, 18 Jun 2015 03:27:08 +0000 (05:27 +0200)]
ffmpeg: Free last_frame instead of just unref

Fixes Ticket4611

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered
Michael Niedermayer [Thu, 18 Jun 2015 00:22:45 +0000 (02:22 +0200)]
avcodec/jpeg2000dec: Continue decoding reslevels even when empty ones are encountered

Fixes Ticket4635

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set
Michael Niedermayer [Wed, 17 Jun 2015 22:34:59 +0000 (00:34 +0200)]
avcodec/ffv1enc: fix bps for >8bit yuv when not explicitly set

Fixes Ticket4636

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/flacenc: Regression test for ticket #4628
George Boyle [Wed, 17 Jun 2015 13:51:16 +0000 (14:51 +0100)]
avcodec/flacenc: Regression test for ticket #4628

Corresponding commit: 2469ed32c81ebf2347e6883091c566724b286167

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b'
Michael Niedermayer [Wed, 17 Jun 2015 18:59:59 +0000 (20:59 +0200)]
Merge commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b'

* commit '1e79d5c6e73ad131f9395f337b58a2b59ee04c1b':
  libwebpenc: use WebPMemoryWriterClear()

See: 7997d78643797d6d26babc4eabbda71049457169
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'
Michael Niedermayer [Wed, 17 Jun 2015 18:53:06 +0000 (20:53 +0200)]
Merge commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c'

* commit 'd8d124eebcf2ec1f6a1936b12a4f00a48f08e85c':
  aic: Improve error reporting

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/j2kenc: Properly flush the end of the truncated AC stream
Michael Niedermayer [Wed, 17 Jun 2015 18:13:05 +0000 (20:13 +0200)]
avcodec/j2kenc: Properly flush the end of the truncated AC stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mqcenc: Add ff_mqc_flush_to()
Michael Niedermayer [Wed, 17 Jun 2015 18:11:43 +0000 (20:11 +0200)]
avcodec/mqcenc: Add ff_mqc_flush_to()

This is needed to separate the end padding from the bitstream, allowing
to end it multiple times without disturbing it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Drop unneeded rlevel variable
Michael Niedermayer [Wed, 17 Jun 2015 13:48:12 +0000 (15:48 +0200)]
avcodec/jpeg2000dec: Drop unneeded rlevel variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Support 9/7 singularity cases on the encoder side
Michael Niedermayer [Wed, 17 Jun 2015 13:24:14 +0000 (15:24 +0200)]
avcodec/jpeg2000dwt: Support 9/7 singularity cases on the encoder side

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibwebpenc: use WebPMemoryWriterClear()
James Almer [Tue, 16 Jun 2015 16:27:20 +0000 (17:27 +0100)]
libwebpenc: use WebPMemoryWriterClear()

WebPMemoryWriterClear() must be used instead of free() when
libwebp ABI version is > 0x0203.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agoavcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode
Michael Niedermayer [Wed, 17 Jun 2015 12:45:15 +0000 (14:45 +0200)]
avcodec/jpeg2000dwt: More special cases to handle singularities in 9/7 decode

Fixes Ticket4634

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaic: Improve error reporting
Vittorio Giovara [Mon, 15 Jun 2015 17:27:53 +0000 (18:27 +0100)]
aic: Improve error reporting

9 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions
Shivraj Patil [Sun, 14 Jun 2015 17:56:22 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions

This patch adds MSA (MIPS-SIMD-Arch) optimizations for H263 lpf functions in new file h263dsp_msa.c

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/brstm: add support for BFSTM files
Rodger Combs [Wed, 17 Jun 2015 08:09:52 +0000 (03:09 -0500)]
lavf/brstm: add support for BFSTM files

Previous version reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavio: fix potential crashes when combining ffio_ensure_seekback + crc
wm4 [Tue, 16 Jun 2015 22:21:02 +0000 (00:21 +0200)]
avio: fix potential crashes when combining ffio_ensure_seekback + crc

Calling ffio_ensure_seekback() if ffio_init_checksum() has been called
on the same context can lead to out of bounds memory accesses and
crashes. The reason is that ffio_ensure_seekback() does not update
checksum_ptr after reallocating the buffer, resulting in a dangling
pointer.

This effectively fixes potential crashes when opening mp3 files.

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