]>
git.sesse.net Git - ffmpeg/log
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>
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>
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>
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'.
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>
Vittorio Giovara [Sun, 9 Mar 2014 07:59:40 +0000 (08:59 +0100)]
fate: add a VP7 test
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>
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>
Michael Niedermayer [Fri, 4 Apr 2014 00:32:16 +0000 (02:32 +0200)]
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>
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>
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>
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
Piotr Bandurski [Thu, 3 Apr 2014 14:30:51 +0000 (16:30 +0200)]
riff: support 0xa100 TwoCC for G723_1
Sample-Id:
4790b7f1c44f98e35f3b806468fa615f5930a5b3 .wav
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
Compn [Tue, 3 Sep 2013 12:25:43 +0000 (08:25 -0400)]
riff: add 0x64 to g726
Sample-Id: g726-test1.wav
Piotr Bandurski [Thu, 3 Apr 2014 14:19:32 +0000 (16:19 +0200)]
riff: add G723_1 wav tag
Compn [Thu, 3 Apr 2014 14:18:26 +0000 (16:18 +0200)]
riff: map 0x0038 to amrnb
Sample-Id: 40709.avi
Paul B Mahol [Thu, 3 Apr 2014 14:15:09 +0000 (16:15 +0200)]
riff: Support FLIC FourCC
Michael Niedermayer [Thu, 3 Apr 2014 14:12:55 +0000 (16:12 +0200)]
riff: add escape130 FourCC
Piotr Bandurski [Thu, 3 Apr 2014 13:39:40 +0000 (15:39 +0200)]
riff: support 'aas4' FourCC
Piotr Bandurski [Thu, 3 Apr 2014 13:37:20 +0000 (15:37 +0200)]
riff: add "YUV8" FourCC
Sample-Id: MAILTEST.AVI
Piotr Bandurski [Thu, 3 Apr 2014 13:34:44 +0000 (15:34 +0200)]
riff: Add "S263" FourCC
Michael Niedermayer [Thu, 3 Apr 2014 13:31:46 +0000 (15:31 +0200)]
riff: Support XMPG as mpeg1
Michael Niedermayer [Thu, 3 Apr 2014 13:10:45 +0000 (15:10 +0200)]
riff: support BW10 as mpeg1
Piotr Bandurski [Thu, 3 Apr 2014 13:09:23 +0000 (15:09 +0200)]
riff: Add SLDV FourCC for dvvideo
Carl Eugen Hoyos [Thu, 3 Apr 2014 13:08:40 +0000 (15:08 +0200)]
riff: Support NTSC forward dvcpro videos
PAL looks incorrect.
Piotr Bandurski [Thu, 3 Apr 2014 13:08:04 +0000 (15:08 +0200)]
riff: add dvis/pdvc FourCCs
Piotr Bandurski [Fri, 9 Nov 2012 23:24:09 +0000 (00:24 +0100)]
riff: add "GXVE" FourCC for WMV2
Sample-Id: vivd.avi
Compn [Thu, 3 Apr 2014 10:58:13 +0000 (12:58 +0200)]
riff: add PLV1 fourcc to mpeg4
Sample-Id: york-water-meteor.avi
Carl Eugen Hoyos [Thu, 3 Apr 2014 10:57:16 +0000 (12:57 +0200)]
riff: Support decoding ASP variant from QNAP Systems
Piotr Bandurski [Thu, 3 Apr 2014 10:56:33 +0000 (12:56 +0200)]
riff: add "SM4V" FourCC
Compn [Tue, 19 Nov 2013 19:24:25 +0000 (14:24 -0500)]
riff: add DYM4 mpeg4 fourcc
Piotr Bandurski [Thu, 15 Aug 2013 12:12:47 +0000 (14:12 +0200)]
riff: add DM4V FourCC
Compn [Fri, 15 Nov 2013 14:45:08 +0000 (09:45 -0500)]
riff: add G264 to mpeg4, only decodes keyframes
Piotr Bandurski [Mon, 5 Nov 2012 16:43:01 +0000 (17:43 +0100)]
riff: add "lsvm" FourCC for H263.
Carl Eugen Hoyos [Mon, 14 Oct 2013 14:29:58 +0000 (16:29 +0200)]
riff: Support H.264 fourcc UMSV
Carl Eugen Hoyos [Thu, 3 Apr 2014 10:46:46 +0000 (12:46 +0200)]
riff: add FourCC for GeoVision cameras
Carl Eugen Hoyos [Sat, 1 Dec 2012 23:43:39 +0000 (00:43 +0100)]
riff: Add V264 for H264 in CCTV recordings
Carl Eugen Hoyos [Thu, 3 Apr 2014 10:00:05 +0000 (12:00 +0200)]
riff: add H264 from QNAP Systems
Piotr Bandurski [Sat, 10 Nov 2012 01:11:49 +0000 (02:11 +0100)]
riff: add SMV2 FourCC for H264
Sample-Id: smv2.avi
Clément Bœsch [Thu, 31 May 2012 07:31:04 +0000 (09:31 +0200)]
riff: add ISMP/timecode 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
Piotr Bandurski [Thu, 3 Apr 2014 08:04:31 +0000 (10:04 +0200)]
isom: add some BOXX tags
Reimar Döffinger [Thu, 3 Apr 2014 07:59:30 +0000 (09:59 +0200)]
isom: add 'flic' 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>
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>
Luca Barbato [Thu, 3 Apr 2014 13:52:13 +0000 (13:52 +0000)]
mxf: Remove typo
Reported-By: Vittorio Giovara <vittorio.giovara@gmail.com>
Luca Barbato [Thu, 3 Apr 2014 19:56:31 +0000 (19:56 +0000)]
log: Unbreak windows support
Add the missing define.
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>
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>
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>
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>
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>
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>
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>
Luca Barbato [Fri, 26 Apr 2013 13:12:05 +0000 (15:12 +0200)]
log: Factorize check_color_terminal() out
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>
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>
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>
Luca Barbato [Thu, 3 Apr 2014 14:29:34 +0000 (14:29 +0000)]
log: Do not assume the TERM variable is always set
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.
Luca Barbato [Thu, 3 Apr 2014 13:51:47 +0000 (13:51 +0000)]
log: Remove undefined behaviour
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Janne Grunau [Tue, 1 Apr 2014 22:39:58 +0000 (00:39 +0200)]
swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64
Carl Eugen Hoyos [Tue, 1 Apr 2014 22:20:36 +0000 (00:20 +0200)]
Write aspect ratio when muxing gif.
Clément Bœsch [Wed, 2 Apr 2014 05:45:06 +0000 (07:45 +0200)]
Changelog: remove unecessary "added"
Michael Niedermayer [Wed, 2 Apr 2014 02:37:33 +0000 (04:37 +0200)]
avcodec/ac3dec: use av_freep() for saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 2 Apr 2014 01:25:29 +0000 (03:25 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1dec: fix a possible unitialized variable warning
Conflicts:
libavcodec/vc1dec.c
No change as the variables where not uninitialized in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 2 Apr 2014 01:14:53 +0000 (03:14 +0200)]
Merge commit '
f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509 '
* commit '
f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509 ':
lavf: add supported extension to avi and mov demuxers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 2 Apr 2014 00:54:09 +0000 (02:54 +0200)]
Merge commit '
cba4e6062a02d5bf684e13a770be88aa1fec717e '
* commit '
cba4e6062a02d5bf684e13a770be88aa1fec717e ':
More correct printf format specifiers
Conflicts:
libavcodec/h264_ps.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 2 Apr 2014 00:43:19 +0000 (02:43 +0200)]
Merge commit '
80035db88c1f7cc23110c7472a2b13a4d2d8b73e '
* commit '
80035db88c1f7cc23110c7472a2b13a4d2d8b73e ':
lavu: add missing formats to av_pix_fmt_swap_endianness
Conflicts:
libavutil/pixdesc.c
No change as our av_pix_fmt_swap_endianness() does not need formats to be listed individually
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 1 Apr 2014 22:32:23 +0000 (00:32 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
mpeg12enc: always set closed gop flag on the first gop
mpeg12enc: always write closed gops for intra only outputs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 31 Mar 2014 23:45:28 +0000 (01:45 +0200)]
vc1dec: fix a possible unitialized variable warning
Marc-Antoine Arnaud [Tue, 1 Apr 2014 17:07:50 +0000 (17:07 +0000)]
lavf: add supported extension to avi and mov demuxers
Diego Biurrun [Tue, 1 Apr 2014 18:19:59 +0000 (18:19 +0000)]
More correct printf format specifiers
This avoids compiler warnings about argument and specifier type mismatch.
Janne Grunau [Tue, 1 Apr 2014 21:11:59 +0000 (21:11 +0000)]
lavu: add missing formats to av_pix_fmt_swap_endianness
Michael Niedermayer [Tue, 1 Apr 2014 22:25:21 +0000 (00:25 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
VP3: K&R formatting cosmetics
Conflicts:
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>