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

5 years agoWrite aspect ratio when muxing gif.
Carl Eugen Hoyos [Tue, 1 Apr 2014 22:20:36 +0000 (00:20 +0200)]
Write aspect ratio when muxing gif.

5 years agoChangelog: remove unecessary "added"
Clément Bœsch [Wed, 2 Apr 2014 05:45:06 +0000 (07:45 +0200)]
Changelog: remove unecessary "added"

5 years agoavcodec/ac3dec: use av_freep() for saftey
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>
5 years agoMerge remote-tracking branch 'qatar/master'
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>
5 years agoMerge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'
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>
5 years agoMerge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
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>
5 years agoMerge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'
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>
5 years agoMerge remote-tracking branch 'cus/stable'
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>
5 years agovc1dec: fix a possible unitialized variable warning
Vittorio Giovara [Mon, 31 Mar 2014 23:45:28 +0000 (01:45 +0200)]
vc1dec: fix a possible unitialized variable warning

5 years agolavf: add supported extension to avi and mov demuxers
Marc-Antoine Arnaud [Tue, 1 Apr 2014 17:07:50 +0000 (17:07 +0000)]
lavf: add supported extension to avi and mov demuxers

5 years agoMore correct printf format specifiers
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.

5 years agolavu: add missing formats to av_pix_fmt_swap_endianness
Janne Grunau [Tue, 1 Apr 2014 21:11:59 +0000 (21:11 +0000)]
lavu: add missing formats to av_pix_fmt_swap_endianness

5 years agoMerge remote-tracking branch 'qatar/master'
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>
5 years agoVP3: K&R formatting cosmetics
Vittorio Giovara [Mon, 31 Mar 2014 16:12:58 +0000 (18:12 +0200)]
VP3: K&R formatting cosmetics

5 years agoMerge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'
Michael Niedermayer [Tue, 1 Apr 2014 19:00:26 +0000 (21:00 +0200)]
Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'

* commit '66d04c068a30751750818dcfbb6555ab74eb3f6d':
  fate: Explicitly use gray16le in fate-sgi-gray16

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg12enc: always set closed gop flag on the first gop
Marton Balint [Sat, 29 Mar 2014 19:31:14 +0000 (20:31 +0100)]
mpeg12enc: always set closed gop flag on the first gop

Improves compatibility with XDCAM HD formats. It has been set for a long time
in ffmbc.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agompeg12enc: always write closed gops for intra only outputs
Marton Balint [Sat, 29 Mar 2014 17:46:10 +0000 (18:46 +0100)]
mpeg12enc: always write closed gops for intra only outputs

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoavcodec/ac3dec_fixed: add missingAVprefix to CODEC_ID
Michael Niedermayer [Tue, 1 Apr 2014 14:31:11 +0000 (16:31 +0200)]
avcodec/ac3dec_fixed: add missingAVprefix to CODEC_ID

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
5 years agoavcodec/ac3dec: avoid #if, use if() instead, its cleaner and shorter
Michael Niedermayer [Tue, 1 Apr 2014 14:31:10 +0000 (16:31 +0200)]
avcodec/ac3dec: avoid #if, use if() instead, its cleaner and shorter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
5 years agoavcodec/ac3: rename identifier used to select the fixed point variant
Michael Niedermayer [Tue, 1 Apr 2014 14:31:09 +0000 (16:31 +0200)]
avcodec/ac3: rename identifier used to select the fixed point variant

the CONFIG_ prefix is used by configure, using it for other things
is potentially confusing to the reader

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
5 years agolibavcodec: Implementation of AC3 fixedpoint decoder
Nedeljko Babic [Tue, 1 Apr 2014 14:31:08 +0000 (16:31 +0200)]
libavcodec: Implementation of AC3 fixedpoint decoder

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/fixed_dsp: remove redundant cast
Michael Niedermayer [Tue, 1 Apr 2014 15:57:30 +0000 (17:57 +0200)]
avutil/fixed_dsp: remove redundant cast

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavutil: Add fixed_dsp
Nedeljko Babic [Tue, 1 Apr 2014 14:31:07 +0000 (16:31 +0200)]
libavutil: Add fixed_dsp

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: add PAL8 support
Michael Niedermayer [Tue, 1 Apr 2014 11:43:44 +0000 (13:43 +0200)]
avcodec/jpeglsdec: add PAL8 support

Fixes Ticket3478

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Explicitly use gray16le in fate-sgi-gray16
Martin Storsjö [Tue, 1 Apr 2014 06:50:09 +0000 (09:50 +0300)]
fate: Explicitly use gray16le in fate-sgi-gray16

This fixes the test on big endian.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavcodec/exr: use av_freep() for saftey
Michael Niedermayer [Tue, 1 Apr 2014 03:18:26 +0000 (05:18 +0200)]
avcodec/exr: use av_freep() for saftey

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMakefile: fix out of tree builds of .m files
Michael Niedermayer [Tue, 1 Apr 2014 03:12:20 +0000 (05:12 +0200)]
Makefile: fix out of tree builds of .m files

should fix fate failures on darwin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 1 Apr 2014 02:24:25 +0000 (04:24 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add SGI tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'
Michael Niedermayer [Tue, 1 Apr 2014 02:19:27 +0000 (04:19 +0200)]
Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'

* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
  sgi: decode 16bit RLE images

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'
Michael Niedermayer [Tue, 1 Apr 2014 02:09:22 +0000 (04:09 +0200)]
Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'

* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38':
  sgi: encode images with 4 channels at 8 and 16 bits

Conflicts:
Changelog
libavcodec/sgienc.c

See: 21a100610977a163fe6480b5cf4c25f34f64b86b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
Michael Niedermayer [Tue, 1 Apr 2014 02:01:28 +0000 (04:01 +0200)]
Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'

* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
Changelog

See: 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
Michael Niedermayer [Tue, 1 Apr 2014 01:55:45 +0000 (03:55 +0200)]
Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'

* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
libavcodec/sgidec.c

See: 0f65693529decc470e3f01cb950b1864ea982c06
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'
Michael Niedermayer [Tue, 1 Apr 2014 01:51:32 +0000 (03:51 +0200)]
Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'

* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
  sgi: set the row boundary to the correct value

Conflicts:
libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0279d1d0946a854aa08919abd05b7f2da433823e'
Michael Niedermayer [Tue, 1 Apr 2014 01:42:29 +0000 (03:42 +0200)]
Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'

* commit '0279d1d0946a854aa08919abd05b7f2da433823e':
  sgi: fix end of line boundary detection

See: 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'
Michael Niedermayer [Tue, 1 Apr 2014 01:37:02 +0000 (03:37 +0200)]
Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'

* commit 'e7cd53bf662a93330810981f1d057bdf2ead669e':
  sgi: check maximum supported resolution

Conflicts:
libavcodec/sgienc.c

See: 59352cc219c4f933c9a83b45043ec4810c2a51ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'
Michael Niedermayer [Tue, 1 Apr 2014 01:29:29 +0000 (03:29 +0200)]
Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
  sgi: K&R formatting cosmetics

Conflicts:
libavcodec/sgidec.c
libavcodec/sgienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'
Michael Niedermayer [Tue, 1 Apr 2014 01:26:40 +0000 (03:26 +0200)]
Merge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'

* commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37':
  codec_desc: set lossless attribute for SGI and DPX

Conflicts:
libavcodec/codec_desc.c

See: 5b802cf567a0ee7a2990e08d08f8aa0abffbb7d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '06688e96fb9577bc7466a380bf7a14fa745208db'
Michael Niedermayer [Tue, 1 Apr 2014 01:23:36 +0000 (03:23 +0200)]
Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'

* commit '06688e96fb9577bc7466a380bf7a14fa745208db':
  fate: add exr tests

Conflicts:
tests/fate/image.mak

See: 87888c043da9da407b3c601c47089163ff0e78d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
Michael Niedermayer [Tue, 1 Apr 2014 01:05:36 +0000 (03:05 +0200)]
Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'

* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
  OpenEXR decoder

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/exr.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'
Michael Niedermayer [Tue, 1 Apr 2014 00:05:41 +0000 (02:05 +0200)]
Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'

* commit '678e455f1dc09265464b13d936d9fda62bc2bf43':
  dxva2: Directly use AVFrames

Conflicts:
libavcodec/dxva2_h264.c

See: 29be9b5301212d29186a05f262a6ce04ddbc168c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add SGI tests
Vittorio Giovara [Wed, 12 Mar 2014 23:29:23 +0000 (00:29 +0100)]
fate: add SGI tests

5 years agosgi: decode 16bit RLE images
Vittorio Giovara [Thu, 13 Mar 2014 14:14:37 +0000 (15:14 +0100)]
sgi: decode 16bit RLE images

5 years agosgi: encode images with 4 channels at 8 and 16 bits
Vittorio Giovara [Thu, 13 Mar 2014 00:19:12 +0000 (01:19 +0100)]
sgi: encode images with 4 channels at 8 and 16 bits

5 years agosgi: decode images with 4 channels at 8 and 16 bits
Carl Eugen Hoyos [Sat, 14 Jan 2012 00:14:51 +0000 (01:14 +0100)]
sgi: decode images with 4 channels at 8 and 16 bits

5 years agosgi: remove redundant argument from read_uncompressed_sgi()
Paul B Mahol [Sun, 8 Jul 2012 23:28:16 +0000 (23:28 +0000)]
sgi: remove redundant argument from read_uncompressed_sgi()

5 years agosgi: set the row boundary to the correct value
Michael Niedermayer [Sun, 12 Aug 2012 03:31:14 +0000 (05:31 +0200)]
sgi: set the row boundary to the correct value

5 years agoavcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2
Michael Niedermayer [Mon, 31 Mar 2014 23:14:26 +0000 (01:14 +0200)]
avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2

Fixes Ticket3516

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agosgi: fix end of line boundary detection
Michael Niedermayer [Sun, 12 Aug 2012 03:32:07 +0000 (05:32 +0200)]
sgi: fix end of line boundary detection

5 years agosgi: check maximum supported resolution
Piotr Bandurski [Thu, 31 May 2012 18:10:04 +0000 (20:10 +0200)]
sgi: check maximum supported resolution

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agosgi: K&R formatting cosmetics
Vittorio Giovara [Thu, 13 Mar 2014 14:20:00 +0000 (15:20 +0100)]
sgi: K&R formatting cosmetics

5 years agocodec_desc: set lossless attribute for SGI and DPX
Paul B Mahol [Fri, 1 Mar 2013 15:22:02 +0000 (15:22 +0000)]
codec_desc: set lossless attribute for SGI and DPX

5 years agofate: add exr tests
Paul B Mahol [Sun, 24 Feb 2013 21:51:31 +0000 (21:51 +0000)]
fate: add exr tests

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoOpenEXR decoder
Jimmy Christensen [Fri, 6 Apr 2012 06:02:25 +0000 (06:02 +0000)]
OpenEXR decoder

Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno,
Nicolas George, Paul B Mahol and Michael Niedermayer.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agodxva2: Directly use AVFrames
Michael Niedermayer [Mon, 31 Mar 2014 14:24:10 +0000 (14:24 +0000)]
dxva2: Directly use AVFrames

The assumption of (MPEG) Picture and H264Picture layout matching might
not hold true in the future.

Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
5 years agoavformat/img2dec: zero probe buffer
Michael Niedermayer [Mon, 31 Mar 2014 21:42:08 +0000 (23:42 +0200)]
avformat/img2dec: zero probe buffer

Fixes use of uninitialized memory
Fixes valgrind failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodshow: fixup some COM objects, based on patches from Don Moir
rogerdpack [Thu, 27 Mar 2014 20:37:48 +0000 (14:37 -0600)]
dshow: fixup some COM objects, based on patches from Don Moir

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/qtkit: Fix non-constant initializer element for some clang compilers.
Thilo Borgmann [Mon, 31 Mar 2014 12:16:26 +0000 (14:16 +0200)]
lavd/qtkit: Fix non-constant initializer element for some clang compilers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 31 Mar 2014 20:07:34 +0000 (22:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov: Unbreak sbtl writing

Conflicts:
libavformat/movenc.c

See: 8a9d0a1561470a185a3d09676fcf9b44830a4bfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'
Michael Niedermayer [Mon, 31 Mar 2014 19:58:26 +0000 (21:58 +0200)]
Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'

* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80':
  vc1dec: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '33259118155764ce27a3433894659dda1d148b5f'
Michael Niedermayer [Mon, 31 Mar 2014 19:49:58 +0000 (21:49 +0200)]
Merge commit '33259118155764ce27a3433894659dda1d148b5f'

* commit '33259118155764ce27a3433894659dda1d148b5f':
  h263: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'
Michael Niedermayer [Mon, 31 Mar 2014 18:34:18 +0000 (20:34 +0200)]
Merge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'

* commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081':
  libx265: Use the repeat headers flag when not using global headers

See: 1b28d9b357db2b6f8360e68c03247d3b81655b10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'
Michael Niedermayer [Mon, 31 Mar 2014 18:24:45 +0000 (20:24 +0200)]
Merge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'

* commit 'cd60631752cafe106b406f00966ac0323ad2ce1f':
  libx265: Bump version requirement

See: 32998ee9577ab32d11c4704fde527df0e982092d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: Unbreak sbtl writing
Michael Niedermayer [Sat, 29 Mar 2014 14:56:03 +0000 (15:56 +0100)]
mov: Unbreak sbtl writing

5 years agovc1dec: improve hwaccel #ifdefs
Rémi Denis-Courmont [Tue, 25 Mar 2014 20:19:58 +0000 (20:19 +0000)]
vc1dec: improve hwaccel #ifdefs