ffmpeg.git
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 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 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 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

5 years agoriff: add G264 to mpeg4, only decodes keyframes
Compn [Fri, 15 Nov 2013 14:45:08 +0000 (09:45 -0500)]
riff: add G264 to mpeg4, only decodes keyframes

5 years agoriff: add "lsvm" FourCC for H263.
Piotr Bandurski [Mon, 5 Nov 2012 16:43:01 +0000 (17:43 +0100)]
riff: add "lsvm" FourCC for H263.

5 years agoriff: Support H.264 fourcc UMSV
Carl Eugen Hoyos [Mon, 14 Oct 2013 14:29:58 +0000 (16:29 +0200)]
riff: Support H.264 fourcc UMSV

5 years agoriff: add FourCC for GeoVision cameras
Carl Eugen Hoyos [Thu, 3 Apr 2014 10:46:46 +0000 (12:46 +0200)]
riff: add FourCC for GeoVision cameras

5 years agoriff: Add V264 for H264 in CCTV recordings
Carl Eugen Hoyos [Sat, 1 Dec 2012 23:43:39 +0000 (00:43 +0100)]
riff: Add V264 for H264 in CCTV recordings

5 years agoriff: add H264 from QNAP Systems
Carl Eugen Hoyos [Thu, 3 Apr 2014 10:00:05 +0000 (12:00 +0200)]
riff: add H264 from QNAP Systems

5 years agoriff: add SMV2 FourCC for H264
Piotr Bandurski [Sat, 10 Nov 2012 01:11:49 +0000 (02:11 +0100)]
riff: add SMV2 FourCC for H264

Sample-Id: smv2.avi

5 years agoriff: add ISMP/timecode tag
Clément Bœsch [Thu, 31 May 2012 07:31:04 +0000 (09:31 +0200)]
riff: add ISMP/timecode tag

5 years agoriff: Add ITRK tag
James Almer [Thu, 18 Jul 2013 08:44:40 +0000 (05:44 -0300)]
riff: Add ITRK tag

Some players, like foobar2000 or modern versions of WMP, create WAV
files using the ITRK tag for track instead of IPRT

5 years agoisom: add some BOXX tags
Piotr Bandurski [Thu, 3 Apr 2014 08:04:31 +0000 (10:04 +0200)]
isom: add some BOXX tags

5 years agoisom: add 'flic' tag
Reimar Döffinger [Thu, 3 Apr 2014 07:59:30 +0000 (09:59 +0200)]
isom: add 'flic' tag

5 years agoisom: add 'm1v ' tag
Carl Eugen Hoyos [Thu, 3 Apr 2014 07:55:32 +0000 (09:55 +0200)]
isom: add 'm1v ' tag

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoavcodec/h264: clear cur_pic structure instead of duplicating it in ff_h264_update_thr...
Michael Niedermayer [Thu, 3 Apr 2014 21:46:25 +0000 (23:46 +0200)]
avcodec/h264: clear cur_pic structure instead of duplicating it in ff_h264_update_thread_context()

Fixes crash

Found-by: iive
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomxf: Remove typo
Luca Barbato [Thu, 3 Apr 2014 13:52:13 +0000 (13:52 +0000)]
mxf: Remove typo

Reported-By: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agolog: Unbreak windows support
Luca Barbato [Thu, 3 Apr 2014 19:56:31 +0000 (19:56 +0000)]
log: Unbreak windows support

Add the missing define.

5 years agoavutil/log: remove stray ;
Michael Niedermayer [Thu, 3 Apr 2014 20:54:50 +0000 (22:54 +0200)]
avutil/log: remove stray ;

regression since  5a18b215f7138c0bd59f27389050b0311fa4a549

Reported-by: J_Darnley
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: fix negative log levels
Michael Niedermayer [Thu, 3 Apr 2014 20:42:24 +0000 (22:42 +0200)]
avutil/log: fix negative log levels

These where broken by 7763118cae4eb468b032dbd29af15a011c2c233b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: add code to test av_log()
Michael Niedermayer [Thu, 3 Apr 2014 20:38:30 +0000 (22:38 +0200)]
avutil/log: add code to test av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 3 Apr 2014 20:18:26 +0000 (22:18 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Do not assume the TERM variable is always set

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '42ba1c51d9e843135772a3b9e5cf036a37b28bdb'
Michael Niedermayer [Thu, 3 Apr 2014 19:07:24 +0000 (21:07 +0200)]
Merge commit '42ba1c51d9e843135772a3b9e5cf036a37b28bdb'

* commit '42ba1c51d9e843135772a3b9e5cf036a37b28bdb':
  log: Document AV_LOG_C usage

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6'
Michael Niedermayer [Thu, 3 Apr 2014 18:53:30 +0000 (20:53 +0200)]
Merge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6'

* commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6':
  log: Remove undefined behaviour

Conflicts:
libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7763118cae4eb468b032dbd29af15a011c2c233b'
Michael Niedermayer [Thu, 3 Apr 2014 18:40:33 +0000 (20:40 +0200)]
Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'

* commit '7763118cae4eb468b032dbd29af15a011c2c233b':
  log: Support for 256color terminals

Conflicts:
doc/APIchanges
libavutil/log.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolog: Factorize check_color_terminal() out
Luca Barbato [Fri, 26 Apr 2013 13:12:05 +0000 (15:12 +0200)]
log: Factorize check_color_terminal() out

5 years agodoc/ffmpeg: restore ascii arrows in Simple filtergraphs
Michael Niedermayer [Thu, 3 Apr 2014 17:19:24 +0000 (19:19 +0200)]
doc/ffmpeg: restore ascii arrows in Simple filtergraphs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '006c253346d90f4abaf69d78083c8ba031628598'
Michael Niedermayer [Thu, 3 Apr 2014 17:16:45 +0000 (19:16 +0200)]
Merge commit '006c253346d90f4abaf69d78083c8ba031628598'

* commit '006c253346d90f4abaf69d78083c8ba031628598':
  doc: Fit the graph in 80 cols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/opt: dont crash on freeing NULL AVOptionRanges
Lukasz Marek [Thu, 3 Apr 2014 12:44:43 +0000 (14:44 +0200)]
lavu/opt: dont crash on freeing NULL AVOptionRanges

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolog: Do not assume the TERM variable is always set
Luca Barbato [Thu, 3 Apr 2014 14:29:34 +0000 (14:29 +0000)]
log: Do not assume the TERM variable is always set

5 years agolog: Document AV_LOG_C usage
Luca Barbato [Thu, 3 Apr 2014 13:51:48 +0000 (13:51 +0000)]
log: Document AV_LOG_C usage

And move outside the wrong doxygen group.

5 years agolog: Remove undefined behaviour
Luca Barbato [Thu, 3 Apr 2014 13:51:47 +0000 (13:51 +0000)]
log: Remove undefined behaviour

5 years agoMerge commit 'lukaszmluki/master^'
Michael Niedermayer [Thu, 3 Apr 2014 14:57:31 +0000 (16:57 +0200)]
Merge commit 'lukaszmluki/master^'

* commit 'lukaszmluki/master^':
  lavu/opt: extend AVOptionRange by extra values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolog: Support for 256color terminals
Luca Barbato [Fri, 26 Apr 2013 13:12:05 +0000 (15:12 +0200)]
log: Support for 256color terminals

And provide extended coloring capabilities for debugging.
The default colors do not change in 256 more to keep
supporting people using Black on White, White on Black and
Solarized terminals.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavfilter.h, buffer.c: use const src pointer in avfilter_copy_buffer_ref_props
Roman Fietze [Thu, 3 Apr 2014 10:46:12 +0000 (12:46 +0200)]
avfilter.h, buffer.c: use const src pointer in avfilter_copy_buffer_ref_props

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/utils.c: av_pkt_dump_log2: use const pointers
Roman Fietze [Thu, 3 Apr 2014 10:44:43 +0000 (12:44 +0200)]
libavformat/utils.c: av_pkt_dump_log2: use const pointers

Use const pointers to AVPacket and AVStream.

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/opt: extend AVOptionRange by extra values
Lukasz Marek [Sun, 30 Mar 2014 13:09:10 +0000 (15:09 +0200)]
lavu/opt: extend AVOptionRange by extra values

AVOptionRange is not flexible enough to store AV_OPT_TYPE_IMAGE_SIZE
ranges. Current implementation can only store pixel count.
This patch aims to keep backward compatibility and extend
AVOptionRange with possibility to store width/height ranges.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agodict: const pointers to dictionary where possible
Roman Fietze [Thu, 3 Apr 2014 10:43:41 +0000 (12:43 +0200)]
dict: const pointers to dictionary where possible

This avoids temporaries or ugly casting in the calling code where
const dictionaries are used. Esp. helpful when writing C++ wrappers
for an AVDictionary having const member functions and CTORs with const
references.

Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Fit the graph in 80 cols
Luca Barbato [Sun, 30 Mar 2014 17:59:33 +0000 (19:59 +0200)]
doc: Fit the graph in 80 cols

Some man pagers do not reflow the text/graphs on resize
and the graphs did not fit the traditional 80cols due
the pod2man excessive indent.

5 years agoavcodec/jpeglsdec: fix palette parsing code
Michael Niedermayer [Thu, 3 Apr 2014 01:26:27 +0000 (03:26 +0200)]
avcodec/jpeglsdec: fix palette parsing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINER: Add CC for dshow maintainer
Michael Niedermayer [Wed, 2 Apr 2014 23:41:23 +0000 (01:41 +0200)]
MAINTAINER: Add CC for dshow maintainer

Requested-by: Roger Pack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add gdi maintainer
Michael Niedermayer [Wed, 2 Apr 2014 23:41:08 +0000 (01:41 +0200)]
MAINTAINERS: add gdi maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd Win32 GDI-based screen grabbing
Calvin Walton [Wed, 2 Apr 2014 18:53:10 +0000 (14:53 -0400)]
Add Win32 GDI-based screen grabbing

Based on original code by Christophe Gisquet in 2010, updated to work
with current ffmpeg APIs.

Supports grabbing a single window or an area of the screen, including
support for multiple monitors (Windows does funky stuff with negative
coordinates here).

I've moved most of the configuration to AVOptions; the input file name
is now only the string "desktop", or "title=<windowname>" to select a
single window. The AVOptions are the same as x11grab where possible.

Code has been added to support a "show_region" mode, like x11grab, which
will draw a rectangle on the screen around the area being captured.

Instead of duplicating code for paletted image handling, I make use of
the GDI API's ability to output DIB (BMP) images, which can be run
through ffmpeg's existing BMP decoder.

Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: remove unneeded l prefix from %lf
Michael Niedermayer [Wed, 2 Apr 2014 22:27:53 +0000 (00:27 +0200)]
avformat/hlsenc: remove unneeded l prefix from %lf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohlsenc: added floating point time support.
Senthilnathan M [Wed, 2 Apr 2014 19:17:13 +0000 (00:47 +0530)]
hlsenc: added floating point time support.

Necessary for HLS version 3 and above.  Fixes ticket #3505.

Signed-off-by: Senthilnathan M <senthil.codr@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 2 Apr 2014 20:43:18 +0000 (22:43 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Write aspect ratio when muxing gif.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/qtkit: Support choosing the input device by index or by name.
Thilo Borgmann [Wed, 2 Apr 2014 20:24:36 +0000 (22:24 +0200)]
lavd/qtkit: Support choosing the input device by index or by name.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/kbdwin: add missing stdint.h include
James Almer [Wed, 2 Apr 2014 07:46:58 +0000 (04:46 -0300)]
lavc/kbdwin: add missing stdint.h include

Fixes make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: add full bgra64 support
Michael Niedermayer [Wed, 2 Apr 2014 17:27:16 +0000 (19:27 +0200)]
swscale: add full bgra64 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: remove unused variables
Michael Niedermayer [Wed, 2 Apr 2014 17:04:58 +0000 (19:04 +0200)]
avformat/avidec: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 2 Apr 2014 16:11:57 +0000 (18:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_settb: rename to settb

Conflicts:
libavfilter/Makefile
libavfilter/f_settb.c
libavfilter/settb.c
libavfilter/vf_settb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'
Michael Niedermayer [Wed, 2 Apr 2014 16:01:48 +0000 (18:01 +0200)]
Merge commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e'

* commit '9d599e3f6e61438772d8cddd6c9b7c495251f51e':
  avi: Improve non-interleaved detection

Conflicts:
libavformat/avidec.c

See: 8df774be88c347c40f1b2411ed9e391dfec0ebb7 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0ca0924c10d9617a5793964bf79655424ef32b68'
Michael Niedermayer [Wed, 2 Apr 2014 11:15:04 +0000 (13:15 +0200)]
Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'

* commit '0ca0924c10d9617a5793964bf79655424ef32b68':
  swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovf_settb: rename to settb
Katerina Barone-Adesi [Tue, 1 Apr 2014 14:51:40 +0000 (16:51 +0200)]
vf_settb: rename to settb

An audio version of settb (asettb) will be added to this file.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavi: Improve non-interleaved detection
Michael Niedermayer [Wed, 2 Apr 2014 07:11:10 +0000 (09:11 +0200)]
avi: Improve non-interleaved detection

Additional fixes by Nigel Touati-Evans <nigel.touatievans@gmail.com>.

Check the index for streams with a time drift of 2s or a buffer drift
of 64MB.

Bug-Id: 666
CC: libav-stable@libav.org
Sample-Id: yet-another-broken-interleaved-avi.avi

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 agoswscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64
Janne Grunau [Tue, 1 Apr 2014 22:39:58 +0000 (00:39 +0200)]
swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64