ffmpeg.git
5 years agoLucasArts SMUSH SANM video decoder
Paul B Mahol [Mon, 19 Mar 2012 02:54:19 +0000 (02:54 +0000)]
LucasArts SMUSH SANM video decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoconfigure: Add workaround for qtkit detection using ICC compiler.
Thilo Borgmann [Sun, 6 Apr 2014 12:57:24 +0000 (14:57 +0200)]
configure: Add workaround for qtkit detection using ICC compiler.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/msrle: check return code for success before use
Michael Niedermayer [Sun, 6 Apr 2014 02:01:24 +0000 (04:01 +0200)]
avcodec/msrle: check return code for success before use

The check is possibly redundant, but better to check for errors
that dont occur than to skip the check and crash

Fixes CID1197060

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pthread_frame: fix missing unlock on error
Michael Niedermayer [Sun, 6 Apr 2014 01:51:46 +0000 (03:51 +0200)]
avcodec/pthread_frame: fix missing unlock on error

Fixes CID1197057
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoConsider aspect ratio when writing tiff dpi.
Carl Eugen Hoyos [Sun, 6 Apr 2014 00:42:31 +0000 (02:42 +0200)]
Consider aspect ratio when writing tiff dpi.

TIFFTAG_YRESOLUTION gets now adjusted to sample_aspect_ratio.

5 years agoavformat/oggparsevorbis: remove non functional null check
Michael Niedermayer [Sat, 5 Apr 2014 23:34:48 +0000 (01:34 +0200)]
avformat/oggparsevorbis: remove non functional null check

Fixes CID1197055

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoexamples/avio_reading: fix null dereference on error
Michael Niedermayer [Sat, 5 Apr 2014 22:39:58 +0000 (00:39 +0200)]
examples/avio_reading: fix null dereference on error

Fixed CID1197052
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/cinedec: ask for sample when biBitCount isnt supported
Michael Niedermayer [Sat, 5 Apr 2014 22:34:09 +0000 (00:34 +0200)]
avformat/cinedec: ask for sample when biBitCount isnt supported

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/cinedec: remove redundant zero termination
Michael Niedermayer [Sat, 5 Apr 2014 21:00:23 +0000 (23:00 +0200)]
avformat/cinedec: remove redundant zero termination

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: Fix width/height typo
Michael Niedermayer [Sat, 5 Apr 2014 20:49:17 +0000 (22:49 +0200)]
avformat/mov: Fix width/height typo

Fixes CID1197050
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/cinedec: fix sizeof()
Michael Niedermayer [Sat, 5 Apr 2014 20:36:06 +0000 (22:36 +0200)]
avformat/cinedec: fix sizeof()

Fixes CID1197047
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/omadec: fix probetest failure
Michael Niedermayer [Sat, 5 Apr 2014 20:07:43 +0000 (22:07 +0200)]
avformat/omadec: fix probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wma: use av_freep(), do not leave stale pointers in memory
Michael Niedermayer [Sat, 5 Apr 2014 19:34:03 +0000 (21:34 +0200)]
avcodec/wma: use av_freep(), do not leave stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp8: fix name of copy_luma()
Michael Niedermayer [Sat, 5 Apr 2014 19:31:25 +0000 (21:31 +0200)]
avcodec/vp8: fix name of copy_luma()

This function was introduced by ac4b32df71bd932838043a4838b86d11e169707f

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 5 Apr 2014 17:43:28 +0000 (19:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: Move DV-specific ff_zigzag248_direct table to dvdata

Conflicts:
libavcodec/dv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5'
Michael Niedermayer [Sat, 5 Apr 2014 17:36:07 +0000 (19:36 +0200)]
Merge commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5'

* commit '57b5b84e208ad61ffdd74ad849bed212deb92bc5':
  x86: dsputil: Move ff_apply_window_int16_* bits to ac3dsp, where they belong

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'
Michael Niedermayer [Sat, 5 Apr 2014 17:30:18 +0000 (19:30 +0200)]
Merge commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99'

* commit 'c2c5be57494e6117086771bca34c8cd4c72c8e99':
  x86: h264_qpel: Simplify an #if conditional

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
Michael Niedermayer [Sat, 5 Apr 2014 17:16:39 +0000 (19:16 +0200)]
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'

* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
  x86: Drop some unnecessary YASM ifdefs

Conflicts:
libavfilter/x86/vf_yadif_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b718b24bbe83d3e8787c1dc6449ccbffcd13a4e7'
Michael Niedermayer [Sat, 5 Apr 2014 17:09:56 +0000 (19:09 +0200)]
Merge commit 'b718b24bbe83d3e8787c1dc6449ccbffcd13a4e7'

* commit 'b718b24bbe83d3e8787c1dc6449ccbffcd13a4e7':
  ppc: Drop a bunch of unnecessary dsputil_altivec.h #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'
Michael Niedermayer [Sat, 5 Apr 2014 17:04:56 +0000 (19:04 +0200)]
Merge commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647'

* commit 'b42f49e42f8cde25a788b2d13d03e99ca2956647':
  x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
Michael Niedermayer [Sat, 5 Apr 2014 16:48:42 +0000 (18:48 +0200)]
Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'

* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
  Remove a number of unnecessary dsputil.h #includes

Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/dcadsp: add ff_dca_lfe_fir0_fma3
James Almer [Thu, 3 Apr 2014 04:46:18 +0000 (01:46 -0300)]
x86/dcadsp: add ff_dca_lfe_fir0_fma3

~10% faster than the SSE version.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: use TMPM in check_header_oc
Michael Niedermayer [Sat, 5 Apr 2014 11:30:27 +0000 (13:30 +0200)]
configure: use TMPM in check_header_oc

Some compilers when given -x objective-c will tell that they dont support
that but return success. Using a .m file instead returns proper failure in
that case

This should fix a build failure on freebsd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: more properly disable header when check_header_oc() fails
Michael Niedermayer [Sat, 5 Apr 2014 11:29:28 +0000 (13:29 +0200)]
configure: more properly disable header when check_header_oc() fails

This should make no difference currently

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/synth_filter: compile avx and fma3 functions unconditionally
James Almer [Sat, 5 Apr 2014 01:53:18 +0000 (22:53 -0300)]
x86/synth_filter: compile avx and fma3 functions unconditionally

Fixes compilation failures with "--disable-{avx,fma3} --disable-optimizations"

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoReindent after last commit.
Thilo Borgmann [Wed, 26 Mar 2014 10:26:08 +0000 (11:26 +0100)]
Reindent after last commit.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by Gregory Wolfe...
Thilo Borgmann [Wed, 26 Mar 2014 10:25:40 +0000 (11:25 +0100)]
lavf/avidec: Read metadata EXIF tags from AVIF tag. Based on patch by Gregory Wolfe (Kodak Alaris) <gregory.wolfe@kodakalaris.com>.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/exif: Make EXIF IFD decoding part of private API/ABI.
Thilo Borgmann [Wed, 26 Mar 2014 10:25:00 +0000 (11:25 +0100)]
lavc/exif: Make EXIF IFD decoding part of private API/ABI.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 5 Apr 2014 01:23:43 +0000 (03:23 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow .y as extension for image2.
  Show stream number when warning about stream without start time.
  Force gif aspect ratio multiplication to 64bit.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAllow .y as extension for image2.
Carl Eugen Hoyos [Sat, 5 Apr 2014 00:18:09 +0000 (02:18 +0200)]
Allow .y as extension for image2.

5 years agoconfigure: Fix testing of objective-c headers for qtkit
Michael Niedermayer [Sat, 5 Apr 2014 00:03:15 +0000 (02:03 +0200)]
configure: Fix testing of objective-c headers for qtkit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoShow stream number when warning about stream without start time.
Carl Eugen Hoyos [Fri, 4 Apr 2014 23:15:12 +0000 (01:15 +0200)]
Show stream number when warning about stream without start time.

5 years agoForce gif aspect ratio multiplication to 64bit.
Carl Eugen Hoyos [Fri, 4 Apr 2014 23:13:47 +0000 (01:13 +0200)]
Force gif aspect ratio multiplication to 64bit.

Avoids a possible integer overflow.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 4 Apr 2014 22:22:05 +0000 (00:22 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'
Michael Niedermayer [Fri, 4 Apr 2014 22:16:53 +0000 (00:16 +0200)]
Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'

* commit 'a49aa440c939e221194f8d95bf98673f8cf38a06':
  af_volume: implement replaygain pre-amplification

Conflicts:
doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/dcadsp_init: fix compilation failure without FMA3
Michael Niedermayer [Fri, 4 Apr 2014 21:57:26 +0000 (23:57 +0200)]
avcodec/x86/dcadsp_init: fix compilation failure without FMA3

alternatively the call could be put under #if or the #if
over the function removed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c74b86699c86bdf62e8570f41d8a38be5710baa3'
Michael Niedermayer [Fri, 4 Apr 2014 21:38:00 +0000 (23:38 +0200)]
Merge commit 'c74b86699c86bdf62e8570f41d8a38be5710baa3'

* commit 'c74b86699c86bdf62e8570f41d8a38be5710baa3':
  x86/synth_filter: add synth_filter_fma3
  x86/synth_filter: add synth_filter_avx
  x86/synth_filter: add synth_filter_sse

Conflicts:
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c

See: 64672098361361cd15d37e36f747ab44de5b80ca
See: 68c3ed936a76c3ff7738f602fa90237ac7e3ce08
See: 7fd64e3e36f79204c0eda7cacce6884c14ddc1fb
See: aa1f38015cb0d04a5c50a8957dd7aba79f0d8882
See: dfd865e51b890d9be394804bccddf55198f4a251
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b97f2c7c49e35724f3963677f8aeee28089dc64e'
Michael Niedermayer [Fri, 4 Apr 2014 21:23:30 +0000 (23:23 +0200)]
Merge commit 'b97f2c7c49e35724f3963677f8aeee28089dc64e'

* commit 'b97f2c7c49e35724f3963677f8aeee28089dc64e':
  replaygain: remove unused variable

See: c01ddf845dcb655e6d6a3382e24bf3af63bad83c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'
Michael Niedermayer [Fri, 4 Apr 2014 21:17:33 +0000 (23:17 +0200)]
Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'

* commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4':
  oggparsevorbis: export replaygain tags from Vorbis comments

Conflicts:
libavformat/Makefile
libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202'
Michael Niedermayer [Fri, 4 Apr 2014 20:59:24 +0000 (22:59 +0200)]
Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202'

* commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202':
  flacdec: export replaygain tags from Vorbis comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'
Michael Niedermayer [Fri, 4 Apr 2014 20:52:12 +0000 (22:52 +0200)]
Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'

* commit '8542f9c4f17125d483c40c0c5723842f1c982f81':
  replaygain: correctly parse peak values

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1'
Michael Niedermayer [Fri, 4 Apr 2014 20:43:37 +0000 (22:43 +0200)]
Merge commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1'

* commit '25b6837f7cacd691b19cbc12b9dad1ce84a318a1':
  replaygain: fix gain sign decoding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/synth_filter: remove the main loop when it's not needed
Christophe Gisquet [Fri, 4 Apr 2014 17:21:40 +0000 (14:21 -0300)]
x86/synth_filter: remove the main loop when it's not needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/opt: validate range before dereference
Lukasz Marek [Fri, 4 Apr 2014 17:28:45 +0000 (19:28 +0200)]
lavu/opt: validate range before dereference

This change make error handling simplier.
av_opt_freep_ranges may be called when some ranges are NULL,
for example after memory allocation fail.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: frame droping due to fps should not be a warning
Michael Niedermayer [Fri, 4 Apr 2014 18:58:59 +0000 (20:58 +0200)]
ffmpeg: frame droping due to fps should not be a warning

This reverts part of 41e7e46cac507e993af6d656c8d3672ba3f9e304

See: http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodsputil: Move DV-specific ff_zigzag248_direct table to dvdata
Diego Biurrun [Wed, 26 Mar 2014 11:41:29 +0000 (04:41 -0700)]
dsputil: Move DV-specific ff_zigzag248_direct table to dvdata

5 years agox86: dsputil: Move ff_apply_window_int16_* bits to ac3dsp, where they belong
Diego Biurrun [Wed, 26 Mar 2014 11:41:28 +0000 (04:41 -0700)]
x86: dsputil: Move ff_apply_window_int16_* bits to ac3dsp, where they belong

5 years agox86: h264_qpel: Simplify an #if conditional
Diego Biurrun [Wed, 26 Mar 2014 11:41:26 +0000 (04:41 -0700)]
x86: h264_qpel: Simplify an #if conditional

The extra conditions are covered by previous #ifs and conditional compilation.

5 years agox86: Drop some unnecessary YASM ifdefs
Diego Biurrun [Wed, 26 Mar 2014 11:41:25 +0000 (04:41 -0700)]
x86: Drop some unnecessary YASM ifdefs

Dead code elimination is enough to avoid undefined references in these cases.

5 years agoppc: Drop a bunch of unnecessary dsputil_altivec.h #includes
Diego Biurrun [Wed, 26 Mar 2014 11:41:24 +0000 (04:41 -0700)]
ppc: Drop a bunch of unnecessary dsputil_altivec.h #includes

5 years agox86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes
Diego Biurrun [Wed, 26 Mar 2014 11:41:23 +0000 (04:41 -0700)]
x86: dsputil: Eliminate some unnecessary dsputil_x86.h #includes

5 years agoRemove a number of unnecessary dsputil.h #includes
Diego Biurrun [Wed, 26 Mar 2014 11:41:22 +0000 (04:41 -0700)]
Remove a number of unnecessary dsputil.h #includes

5 years agoaf_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY
Anton Khirnov [Thu, 3 Apr 2014 12:22:48 +0000 (14:22 +0200)]
af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY

5 years agoaf_volume: implement replaygain pre-amplification
Alessandro Ghedini [Fri, 4 Apr 2014 16:42:09 +0000 (18:42 +0200)]
af_volume: implement replaygain pre-amplification

This adds a new "replaygain_preamp" option to the filter, and simply adds its
value to the replaygain gain value.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec.h, avpacket.c: use const AVPacket pointers in copy functions
Roman Fietze [Thu, 3 Apr 2014 10:45:35 +0000 (12:45 +0200)]
avcodec.h, avpacket.c: use const AVPacket pointers in copy functions

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/synth_filter: add synth_filter_fma3
James Almer [Thu, 20 Mar 2014 18:37:56 +0000 (15:37 -0300)]
x86/synth_filter: add synth_filter_fma3

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoreplaygain: remove unused variable
Michael Niedermayer [Fri, 4 Apr 2014 09:50:49 +0000 (11:50 +0200)]
replaygain: remove unused variable

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agooggparsevorbis: export replaygain tags from Vorbis comments
Alessandro Ghedini [Fri, 4 Apr 2014 09:50:46 +0000 (11:50 +0200)]
oggparsevorbis: export replaygain tags from Vorbis comments

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoflacdec: export replaygain tags from Vorbis comments
Alessandro Ghedini [Fri, 4 Apr 2014 09:50:45 +0000 (11:50 +0200)]
flacdec: export replaygain tags from Vorbis comments

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agox86/synth_filter: add synth_filter_avx
James Almer [Thu, 20 Mar 2014 18:37:55 +0000 (15:37 -0300)]
x86/synth_filter: add synth_filter_avx

Sandy Bridge Win64:
180 cycles in ff_synth_filter_inner_sse2
150 cycles in ff_synth_filter_inner_avx

Also switch some instructions to a three operand format to avoid
assembly errors with Yasm 1.1.0 or older.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agox86/synth_filter: add synth_filter_sse
James Almer [Thu, 20 Mar 2014 18:37:54 +0000 (15:37 -0300)]
x86/synth_filter: add synth_filter_sse

Build only on x86_32 targets.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoreplaygain: correctly parse peak values
Alessandro Ghedini [Fri, 4 Apr 2014 09:50:44 +0000 (11:50 +0200)]
replaygain: correctly parse peak values

According to the ReplayGain spec, the peak amplitude may overflow and may result
in peak amplitude values greater than 1.0 with psychoacoustically coded audio,
such as MP3. Fully compliant decoders must allow peak overflows.

Additionally, having peak values in the 0<->UINT32_MAX scale makes it more
difficult for applications to actually use the peak values (e.g. when
implementing clipping prevention) since values have to be rescaled down.

This patch corrects the peak parsing by removing the rescaling of the decoded
values between 0 and UINT32_MAX and the 1.0 upper limit.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavformat/wtvdec: populate codec_tag from BITMAPINFOHEADER
Peter Ross [Fri, 4 Apr 2014 11:07:47 +0000 (22:07 +1100)]
avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalid
Peter Ross [Fri, 4 Apr 2014 11:07:36 +0000 (22:07 +1100)]
avformat/wtvdec: ignore MPEG2VIDEO extradata when count is invalid

Fixes ticket #3522.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoreplaygain: fix gain sign decoding
Alessandro Ghedini [Fri, 4 Apr 2014 09:50:43 +0000 (11:50 +0200)]
replaygain: fix gain sign decoding

The gain sign was incorrectly decoded: since the FFSIGN() macro treats 0 as
negative, gain values starting with "0." were always decoded as negative.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agooggenc: check return value of av_mallocz()
James Almer [Fri, 4 Apr 2014 06:19:59 +0000 (03:19 -0300)]
oggenc: check return value of av_mallocz()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 4 Apr 2014 13:19:07 +0000 (15:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: asm decode_block_coeffs_internal is vp8 specific

See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '287432430c5c9cb8ffe1da1376949de494f24e45'
Michael Niedermayer [Fri, 4 Apr 2014 13:09:45 +0000 (15:09 +0200)]
Merge commit '287432430c5c9cb8ffe1da1376949de494f24e45'

* commit '287432430c5c9cb8ffe1da1376949de494f24e45':
  fate: add a VP7 test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ac4b32df71bd932838043a4838b86d11e169707f'
Michael Niedermayer [Fri, 4 Apr 2014 12:31:04 +0000 (14:31 +0200)]
Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'

* commit 'ac4b32df71bd932838043a4838b86d11e169707f':
  On2 VP7 decoder

Conflicts:
Changelog
libavcodec/arm/h264pred_init_arm.c
libavcodec/arm/vp8dsp.h
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/avcodec.h
libavcodec/h264pred.c
libavcodec/version.h
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c
libavcodec/vp8dsp.h
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/vp8dsp_init.c

See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: asm decode_block_coeffs_internal is vp8 specific
Janne Grunau [Fri, 4 Apr 2014 08:11:06 +0000 (10:11 +0200)]
arm: asm decode_block_coeffs_internal is vp8 specific

Unbreaks compilation on arm due to conflicting types for
'ff_decode_block_coeffs_armv6'.

5 years agolog: allow color highlighting in Cygwin's mintty
James Darnley [Thu, 3 Apr 2014 22:45:29 +0000 (00:45 +0200)]
log: allow color highlighting in Cygwin's mintty

Configure will detect the availability of the Windows' console functions and set
HAVE_SETCONSOLETEXTATTRIBUTE.  Meaning av_log will use those functions to
control colours.  When ffmpeg is run in Cygwin's mintty terminal emulator it
will not use colour highlighting in this case.

Mintty responds to the usual escape code colours (it even supports 256 colours).
Windows' cmd.exe does not.  Fortunately it seems that Cygwin's emulation layer
now translates the basic 16 colours into Windows' Console command functions.

That means that we can have av_log use the standard colour commands and let
ffmpeg print colours in both mintty and cmd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add a VP7 test
Vittorio Giovara [Sun, 9 Mar 2014 07:59:40 +0000 (08:59 +0100)]
fate: add a VP7 test

5 years agoOn2 VP7 decoder
Peter Ross [Tue, 1 Apr 2014 12:21:51 +0000 (14:21 +0200)]
On2 VP7 decoder

Further performance improvements and security fixes by
Vittorio Giovara, Luca Barbato and Diego Biurrun.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 4 Apr 2014 00:54:53 +0000 (02:54 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (31 commits)
  riff: Add an additional AAC TwoCC
  riff: support 0xa100 TwoCC for G723_1
  riff: add 0x594a TwoCC for Xan DPCM
  riff: add 0x64 to g726
  riff: add G723_1 wav tag
  riff: map 0x0038 to amrnb
  riff: Support FLIC FourCC
  riff: add escape130 FourCC
  riff: support 'aas4' FourCC
  riff: add "YUV8" FourCC
  riff: Add "S263" FourCC
  riff: Support XMPG as mpeg1
  riff: support BW10 as mpeg1
  riff: Add SLDV FourCC for dvvideo
  riff: Support NTSC forward dvcpro videos
  riff: add dvis/pdvc FourCCs
  riff: add "GXVE" FourCC for WMV2
  riff: add PLV1 fourcc to mpeg4
  riff: Support decoding ASP variant from QNAP Systems
  riff: add "SM4V" FourCC
  ...

Conflicts:
libavformat/riff.c

See: various commits, all the merged changes where in ffmpeg already

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'
Michael Niedermayer [Fri, 4 Apr 2014 00:32:16 +0000 (02:32 +0200)]
Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'

* commit '121b5b7e0476d22408d748b914799b7c00acc3a4':
  isom: add some BOXX tags
  isom: add 'flic' tag
  isom: add 'm1v ' tag

Conflicts:
libavformat/isom.c

See: ca8623e1a537fa48366efebdf235442f1197bb71
See: 8a3f976498cc096644b95ade7240a73e17d3a042
See: fca62f05005567514b5daaea230ba9365e202201
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'
Michael Niedermayer [Fri, 4 Apr 2014 00:14:44 +0000 (02:14 +0200)]
Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'

* commit 'ad8f736b7404503d8f5164f4879175a2258dd64b':
  mxf: Remove typo

also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'
Michael Niedermayer [Fri, 4 Apr 2014 00:08:24 +0000 (02:08 +0200)]
Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'

* commit '9464b69da6b373d1eeb6b3d269ad029d9647b498':
  log: Unbreak windows support

Conflicts:
libavutil/log.c

No change as we didnt use print_256color() in our implementation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: check and use -Wempty-body
James Darnley [Thu, 3 Apr 2014 23:18:02 +0000 (01:18 +0200)]
configure: check and use -Wempty-body

Would have shown the trailing semi-colon in lavu/log.c that broke detection of
256 colour capable terminals.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoriff: Add an additional AAC TwoCC
Carl Eugen Hoyos [Thu, 3 Apr 2014 14:32:59 +0000 (16:32 +0200)]
riff: Add an additional AAC TwoCC

Mentioned on http://msdn.microsoft.com/en-us/library/dd341376%28prot.20%29.aspx

5 years agoriff: support 0xa100 TwoCC for G723_1
Piotr Bandurski [Thu, 3 Apr 2014 14:30:51 +0000 (16:30 +0200)]
riff: support 0xa100 TwoCC for G723_1

Sample-Id: 4790b7f1c44f98e35f3b806468fa615f5930a5b3.wav

5 years agoriff: add 0x594a TwoCC for Xan DPCM
Piotr Bandurski [Thu, 3 Apr 2014 14:29:32 +0000 (16:29 +0200)]
riff: add 0x594a TwoCC for Xan DPCM

Sample-Id: crusader-no-regret.avi

5 years agoriff: add 0x64 to g726
Compn [Tue, 3 Sep 2013 12:25:43 +0000 (08:25 -0400)]
riff: add 0x64 to g726

Sample-Id: g726-test1.wav

5 years agoriff: add G723_1 wav tag
Piotr Bandurski [Thu, 3 Apr 2014 14:19:32 +0000 (16:19 +0200)]
riff: add G723_1 wav tag

5 years agoriff: map 0x0038 to amrnb
Compn [Thu, 3 Apr 2014 14:18:26 +0000 (16:18 +0200)]
riff: map 0x0038 to amrnb

Sample-Id: 40709.avi

5 years agoriff: Support FLIC FourCC
Paul B Mahol [Thu, 3 Apr 2014 14:15:09 +0000 (16:15 +0200)]
riff: Support FLIC FourCC

5 years agoriff: add escape130 FourCC
Michael Niedermayer [Thu, 3 Apr 2014 14:12:55 +0000 (16:12 +0200)]
riff: add escape130 FourCC

5 years agoriff: support 'aas4' FourCC
Piotr Bandurski [Thu, 3 Apr 2014 13:39:40 +0000 (15:39 +0200)]
riff: support 'aas4' FourCC

5 years agoriff: add "YUV8" FourCC
Piotr Bandurski [Thu, 3 Apr 2014 13:37:20 +0000 (15:37 +0200)]
riff: add "YUV8" FourCC

Sample-Id: MAILTEST.AVI

5 years agoriff: Add "S263" FourCC
Piotr Bandurski [Thu, 3 Apr 2014 13:34:44 +0000 (15:34 +0200)]
riff: Add "S263" FourCC

5 years agoriff: Support XMPG as mpeg1
Michael Niedermayer [Thu, 3 Apr 2014 13:31:46 +0000 (15:31 +0200)]
riff: Support XMPG as mpeg1

5 years agoriff: support BW10 as mpeg1
Michael Niedermayer [Thu, 3 Apr 2014 13:10:45 +0000 (15:10 +0200)]
riff: support BW10 as mpeg1

5 years agoriff: Add SLDV FourCC for dvvideo
Piotr Bandurski [Thu, 3 Apr 2014 13:09:23 +0000 (15:09 +0200)]
riff: Add SLDV FourCC for dvvideo

5 years agoriff: Support NTSC forward dvcpro videos
Carl Eugen Hoyos [Thu, 3 Apr 2014 13:08:40 +0000 (15:08 +0200)]
riff: Support NTSC forward dvcpro videos

PAL looks incorrect.

5 years agoriff: add dvis/pdvc FourCCs
Piotr Bandurski [Thu, 3 Apr 2014 13:08:04 +0000 (15:08 +0200)]
riff: add dvis/pdvc FourCCs

5 years agoriff: add "GXVE" FourCC for WMV2
Piotr Bandurski [Fri, 9 Nov 2012 23:24:09 +0000 (00:24 +0100)]
riff: add "GXVE" FourCC for WMV2

Sample-Id: vivd.avi

5 years agoriff: add PLV1 fourcc to mpeg4
Compn [Thu, 3 Apr 2014 10:58:13 +0000 (12:58 +0200)]
riff: add PLV1 fourcc to mpeg4

Sample-Id: york-water-meteor.avi

5 years agoriff: Support decoding ASP variant from QNAP Systems
Carl Eugen Hoyos [Thu, 3 Apr 2014 10:57:16 +0000 (12:57 +0200)]
riff: Support decoding ASP variant from QNAP Systems

5 years agoriff: add "SM4V" FourCC
Piotr Bandurski [Thu, 3 Apr 2014 10:56:33 +0000 (12:56 +0200)]
riff: add "SM4V" FourCC

5 years agoriff: add DYM4 mpeg4 fourcc
Compn [Tue, 19 Nov 2013 19:24:25 +0000 (14:24 -0500)]
riff: add DYM4 mpeg4 fourcc

5 years agoriff: add DM4V FourCC
Piotr Bandurski [Thu, 15 Aug 2013 12:12:47 +0000 (14:12 +0200)]
riff: add DM4V FourCC