ffmpeg.git
6 years agoavformat: move PROBE_BUF_M* to internal.h
Michael Niedermayer [Sun, 25 Aug 2013 22:54:30 +0000 (00:54 +0200)]
avformat: move PROBE_BUF_M* to internal.h

They will be used by the mp3 probe function in the next commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/tcp: fix pointer to int warning
Michael Niedermayer [Sun, 25 Aug 2013 17:44:40 +0000 (19:44 +0200)]
avformat/tcp: fix pointer to int warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/graph2dot: fix use of deprecated *put_count
Michael Niedermayer [Sun, 25 Aug 2013 17:37:37 +0000 (19:37 +0200)]
tools/graph2dot: fix use of deprecated *put_count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/graphparser: fix use of deprecated symbols
Michael Niedermayer [Sun, 25 Aug 2013 17:36:58 +0000 (19:36 +0200)]
avfilter/graphparser: fix use of deprecated symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/graphdump: fix use of deprecated symbols
Michael Niedermayer [Sun, 25 Aug 2013 17:14:17 +0000 (19:14 +0200)]
avfilter/graphdump: fix use of deprecated symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/filtfmts: fix use of deprecated symbols
Michael Niedermayer [Sun, 25 Aug 2013 17:14:17 +0000 (19:14 +0200)]
avfilter/filtfmts: fix use of deprecated symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 25 Aug 2013 10:26:08 +0000 (12:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: Free rbsp_buffer before copying context over it
Michael Niedermayer [Sun, 25 Aug 2013 01:15:26 +0000 (03:15 +0200)]
avcodec/h264: Free rbsp_buffer before copying context over it

Fixes memleak
Fixes Ticket1900

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak
Michael Niedermayer [Sun, 25 Aug 2013 01:29:52 +0000 (03:29 +0200)]
avcodec/h264: Zero rbsp_buffer earler to ensure no duplicated pointers can leak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: prevent rbsp_buffer values from becoming duplicated
Michael Niedermayer [Sun, 25 Aug 2013 01:01:19 +0000 (03:01 +0200)]
h264: prevent rbsp_buffer values from becoming duplicated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/movenc: move chapter_properties under the #if of the code that uses it
Michael Niedermayer [Sat, 24 Aug 2013 21:23:00 +0000 (23:23 +0200)]
avcodec/movenc: move chapter_properties under the #if of the code that uses it

Fixes warning about unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ituh263dec: detect and warn about RTP
Michael Niedermayer [Sat, 24 Aug 2013 21:06:59 +0000 (23:06 +0200)]
avcodec/ituh263dec: detect and warn about RTP

Fixes Ticket925
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: make next_nb_channels[] static const
Michael Niedermayer [Sat, 24 Aug 2013 12:27:16 +0000 (14:27 +0200)]
ffplay: make next_nb_channels[] static const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h263dec: fix aspect of lead h263 EHC
Michael Niedermayer [Sat, 24 Aug 2013 16:44:24 +0000 (18:44 +0200)]
avcodec/h263dec: fix aspect of lead h263 EHC

Fixes part of ticket925

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_cabac: Mark functions calling decode_cabac_residual_internal as noinline
Diego Biurrun [Thu, 15 Aug 2013 22:29:23 +0000 (00:29 +0200)]
h264_cabac: Mark functions calling decode_cabac_residual_internal as noinline

This ensures that decode_cabac_residual_internal actually does get inlined,
which it otherwise does not, even though it is marked as always_inline.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 24 Aug 2013 09:30:23 +0000 (11:30 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'
Michael Niedermayer [Sat, 24 Aug 2013 09:21:25 +0000 (11:21 +0200)]
Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'

* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
  libfdk-aacdec: formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'
Michael Niedermayer [Sat, 24 Aug 2013 09:03:51 +0000 (11:03 +0200)]
Merge commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9'

* commit '8506ff97c9ea4a1f52983497ecf8d4ef193403a9':
  vp56: Mark VP6-only optimizations as such.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h263dec: use FF_CEIL_RSHIFT()
Michael Niedermayer [Sat, 24 Aug 2013 02:09:43 +0000 (04:09 +0200)]
avcodec/h263dec: use FF_CEIL_RSHIFT()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: check log2_cblk dimensions
Michael Niedermayer [Sat, 24 Aug 2013 01:19:40 +0000 (03:19 +0200)]
jpeg2000: check log2_cblk dimensions

Fixes out of array access
Fixes Ticket2895

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion1: check av_fast_malloc() return value
Paul B Mahol [Fri, 23 Aug 2013 23:16:13 +0000 (23:16 +0000)]
truemotion1: check av_fast_malloc() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotruemotion1: use av_freep()
Paul B Mahol [Fri, 23 Aug 2013 23:12:42 +0000 (23:12 +0000)]
truemotion1: use av_freep()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agompeg4videodec: fix GEOV/GEOX fliping
Michael Niedermayer [Fri, 23 Aug 2013 22:56:26 +0000 (00:56 +0200)]
mpeg4videodec: fix GEOV/GEOX fliping

Fixes Ticket317
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowenc: change a bunch of assert() to av_assert()
Michael Niedermayer [Fri, 23 Aug 2013 20:31:27 +0000 (22:31 +0200)]
snowenc: change a bunch of assert() to av_assert()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopngdec: do not release buffer on failure instead report full progress
Paul B Mahol [Fri, 23 Aug 2013 18:55:55 +0000 (18:55 +0000)]
pngdec: do not release buffer on failure instead report full progress

Should fix heap-use-after-free as reported by Address Sanitizer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMAINTAINERS: Add my GPG fingerprint
Alexander Strasser [Tue, 26 Jun 2012 21:05:55 +0000 (23:05 +0200)]
MAINTAINERS: Add my GPG fingerprint

6 years agoavformat/redspark: check coef_off
Michael Niedermayer [Fri, 23 Aug 2013 17:12:54 +0000 (19:12 +0200)]
avformat/redspark: check coef_off

Fixes out of array reads

Found-by: Laurent Butti <laurentb@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: fix null pointer dereference in case of malloc failure
Michael Niedermayer [Fri, 23 Aug 2013 15:50:12 +0000 (17:50 +0200)]
jpeg2000: fix null pointer dereference in case of malloc failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: zero reslevel array on allocation
Michael Niedermayer [Fri, 23 Aug 2013 16:05:53 +0000 (18:05 +0200)]
jpeg2000: zero reslevel array on allocation

prevent use of uninitialized values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojpeg2000: fix dereferencing invalid pointers
Michael Niedermayer [Fri, 23 Aug 2013 15:18:21 +0000 (17:18 +0200)]
jpeg2000: fix dereferencing invalid pointers

Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder
Diego Biurrun [Fri, 23 Aug 2013 14:59:43 +0000 (16:59 +0200)]
arm: h264chroma: Do not compile h264_chroma_mc* dependent on h264 decoder

The functions are used by all codecs that enable the h264chroma component
and the file is already compiled conditional on h264chroma being enabled.

6 years agolibfdk-aacdec: formatting cosmetics
Diego Biurrun [Wed, 21 Aug 2013 13:09:18 +0000 (15:09 +0200)]
libfdk-aacdec: formatting cosmetics

6 years agovp56: Mark VP6-only optimizations as such.
Diego Biurrun [Sat, 6 Oct 2012 18:28:56 +0000 (20:28 +0200)]
vp56: Mark VP6-only optimizations as such.

Most of our VP56 optimizations are VP6-only and will stay that way.
So avoid compiling them for VP5-only builds.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 23 Aug 2013 11:43:05 +0000 (13:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Make tkhd "enabled" flag QuickTime compatible

Conflicts:
libavformat/movenc.c
tests/ref/acodec/alac
tests/ref/acodec/pcm-s16be
tests/ref/acodec/pcm-s24be
tests/ref/acodec/pcm-s32be
tests/ref/acodec/pcm-s8
tests/ref/lavf/mov
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth1-prores
tests/ref/vsynth/vsynth1-qtrle
tests/ref/vsynth/vsynth1-svq1
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-svq1

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7'
Michael Niedermayer [Fri, 23 Aug 2013 11:16:07 +0000 (13:16 +0200)]
Merge commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7'

* commit '1f70a5ad284b33e8b3e2b40a5cb33055419781b7':
  mov: use tkhd enabled flag to set the default track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopngdec: use av_fast_padded_malloc(z)
Paul B Mahol [Thu, 22 Aug 2013 17:05:53 +0000 (17:05 +0000)]
pngdec: use av_fast_padded_malloc(z)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/tile: do not leak input frame
Paul B Mahol [Thu, 22 Aug 2013 20:31:22 +0000 (20:31 +0000)]
lavfi/tile: do not leak input frame

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/tee: copy metadata to output chained muxers
Stefano Sabatini [Fri, 23 Aug 2013 08:16:59 +0000 (10:16 +0200)]
lavf/tee: copy metadata to output chained muxers

6 years agomovenc: Make tkhd "enabled" flag QuickTime compatible
John Stebbins [Thu, 22 Aug 2013 14:25:18 +0000 (07:25 -0700)]
movenc: Make tkhd "enabled" flag QuickTime compatible

QuickTime will play multiple audio tracks concurrently if this flag is
set for multiple audio tracks.  And if no subtitle track has this flag
set, QuickTime will show no subtitles in the subtitle menu.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agomov: use tkhd enabled flag to set the default track
John Stebbins [Thu, 22 Aug 2013 14:25:17 +0000 (07:25 -0700)]
mov: use tkhd enabled flag to set the default track

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavcodec/mjpegdec: fix overread in find_marker()
Michael Niedermayer [Fri, 23 Aug 2013 02:14:08 +0000 (04:14 +0200)]
avcodec/mjpegdec: fix overread in find_marker()

Found-by: Laurent Butti <laurentb@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix dependencies for h263 vaapi decoder.
Carl Eugen Hoyos [Fri, 23 Aug 2013 00:11:49 +0000 (02:11 +0200)]
Fix dependencies for h263 vaapi decoder.

6 years agoavcodec/jpeg2000dec: Check cdx/y values more carefully
Michael Niedermayer [Wed, 21 Aug 2013 02:40:50 +0000 (04:40 +0200)]
avcodec/jpeg2000dec: Check cdx/y values more carefully

Some invalid values where not handled correctly in the later pixel
format matching code.
Fixes out of array accesses
Fixes Ticket2848

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/movenc: use av_freep() instead of av_free() except for local variables befor...
Michael Niedermayer [Thu, 22 Aug 2013 22:29:56 +0000 (00:29 +0200)]
avformat/movenc: use av_freep() instead of av_free() except for local variables before return

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/hue: allow changing brightness
Paul B Mahol [Wed, 21 Aug 2013 17:42:32 +0000 (17:42 +0000)]
lavfi/hue: allow changing brightness

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopngdec: frame multithreading support
Paul B Mahol [Mon, 12 Aug 2013 10:56:20 +0000 (10:56 +0000)]
pngdec: frame multithreading support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 22 Aug 2013 12:28:22 +0000 (14:28 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Split DCT and FFT initialization into separate files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/image2: extend start_number range to accept zero
Stefano Sabatini [Thu, 22 Aug 2013 08:09:11 +0000 (10:09 +0200)]
lavf/image2: extend start_number range to accept zero

Address trac ticket #2884.

6 years agoMerge commit '60198742ff851f11a3757c713fc75a9c19b88566'
Michael Niedermayer [Thu, 22 Aug 2013 12:16:52 +0000 (14:16 +0200)]
Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'

* commit '60198742ff851f11a3757c713fc75a9c19b88566':
  movenc: fix detection of 64bit offset requirement

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'
Michael Niedermayer [Thu, 22 Aug 2013 11:42:47 +0000 (13:42 +0200)]
Merge commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e'

* commit 'fe5d5a8ffcafdc14c0d26eaea6464c89e120cc9e':
  movenc: Make chapter track QuickTime compatible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'
Michael Niedermayer [Thu, 22 Aug 2013 11:37:16 +0000 (13:37 +0200)]
Merge commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b'

* commit 'f8ef91ff3d6bb83d601d816ef9368f911021c64b':
  movenc: add faststart option for web streaming

Conflicts:
doc/muxers.texi
libavformat/movenc.c
libavformat/movenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4622f11f9c83db8a2e08408c71ff901826ca652c'
Michael Niedermayer [Thu, 22 Aug 2013 11:09:00 +0000 (13:09 +0200)]
Merge commit '4622f11f9c83db8a2e08408c71ff901826ca652c'

* commit '4622f11f9c83db8a2e08408c71ff901826ca652c':
  w32pthread: help compiler figure out undeeded code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4'
Michael Niedermayer [Thu, 22 Aug 2013 11:03:58 +0000 (13:03 +0200)]
Merge commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4'

* commit '0b45269c2d732d15afa2de9c475d85fcf5561ac4':
  x86: h264_idct: Remove incorrect comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/gradfun: support gbrp
Paul B Mahol [Thu, 22 Aug 2013 10:47:25 +0000 (10:47 +0000)]
lavfi/gradfun: support gbrp

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/tee: initialize ret in parse_bsfs()
Stefano Sabatini [Thu, 22 Aug 2013 07:44:21 +0000 (09:44 +0200)]
lavf/tee: initialize ret in parse_bsfs()

Fix spurious failures.

6 years agoavcodec/rpza: Perform pointer advance and checks before using the pointers
Michael Niedermayer [Wed, 21 Aug 2013 23:07:32 +0000 (01:07 +0200)]
avcodec/rpza: Perform pointer advance and checks before using the pointers

Fixes out of array accesses
Fixes Ticket2850

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoloco: use init_get_bits8()
Paul B Mahol [Wed, 21 Aug 2013 20:29:05 +0000 (20:29 +0000)]
loco: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/separatefields: fix frame leak
Paul B Mahol [Wed, 21 Aug 2013 20:02:25 +0000 (20:02 +0000)]
lavfi/separatefields: fix frame leak

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoqtrle: make code independent of sizeof(AVFrame)
Paul B Mahol [Wed, 21 Aug 2013 19:27:31 +0000 (19:27 +0000)]
qtrle: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoqtrle: use memcpy()
Paul B Mahol [Wed, 21 Aug 2013 19:13:03 +0000 (19:13 +0000)]
qtrle: use memcpy()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoqtrle: use uint16_t and (u)int8_t instead of unsigned short and unsigned char
Paul B Mahol [Wed, 21 Aug 2013 19:03:40 +0000 (19:03 +0000)]
qtrle: use uint16_t and (u)int8_t instead of unsigned short and unsigned char

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoqtrle: use bytestream2_get_buffer()
Paul B Mahol [Wed, 21 Aug 2013 18:57:30 +0000 (18:57 +0000)]
qtrle: use bytestream2_get_buffer()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/mdec: use init_get_bits8()
Paul B Mahol [Wed, 21 Aug 2013 18:34:04 +0000 (18:34 +0000)]
avcodec/mdec: use init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agox86: Split DCT and FFT initialization into separate files
Diego Biurrun [Sun, 4 Aug 2013 11:24:15 +0000 (13:24 +0200)]
x86: Split DCT and FFT initialization into separate files

6 years agoconfigure: Add exif to CONFIG_EXTRA.
Thilo Borgmann [Wed, 21 Aug 2013 16:26:40 +0000 (18:26 +0200)]
configure: Add exif to CONFIG_EXTRA.

Add exif as a common component in CONFIG_EXTRA in order to avoid many
dependencies to 'exif.o tiff_common.o' in lavc/Makefile.

6 years agodoc/muxers: add elaborated example for the tee muxer
Stefano Sabatini [Sat, 3 Aug 2013 12:05:13 +0000 (14:05 +0200)]
doc/muxers: add elaborated example for the tee muxer

The example shows how to combine bsfs and select options.

6 years agolavf/tee: add special select option
Stefano Sabatini [Thu, 8 Aug 2013 10:11:59 +0000 (12:11 +0200)]
lavf/tee: add special select option

6 years agolavfi/hue: use lookup tables
Paul B Mahol [Mon, 19 Aug 2013 19:09:58 +0000 (19:09 +0000)]
lavfi/hue: use lookup tables

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomovenc: fix detection of 64bit offset requirement
Clément Bœsch [Tue, 20 Aug 2013 14:46:09 +0000 (07:46 -0700)]
movenc: fix detection of 64bit offset requirement

The old method doesn't work when moov is relocated to beginning of file

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Make chapter track QuickTime compatible
John Stebbins [Mon, 19 Aug 2013 23:05:33 +0000 (16:05 -0700)]
movenc: Make chapter track QuickTime compatible

QuickTime requires that the stsd.text box be completely filled in.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: add faststart option for web streaming
Clément Bœsch [Mon, 19 Aug 2013 23:05:31 +0000 (16:05 -0700)]
movenc: add faststart option for web streaming

Faststart moves the moov atom to the beginning of the file and rewrites
the rest of the file after muxing is complete.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agow32pthread: help compiler figure out undeeded code
Rafaël Carré [Tue, 20 Aug 2013 17:25:22 +0000 (19:25 +0200)]
w32pthread: help compiler figure out undeeded code

The emulation code is not needed when targetting Vista+
This helps getting rid of CreateSemaphore symbol, which is
forbidden in Windows Store apps.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86: h264_idct: Remove incorrect comment
Diego Biurrun [Mon, 19 Aug 2013 13:32:36 +0000 (15:32 +0200)]
x86: h264_idct: Remove incorrect comment

6 years agodoc/filters: move fps filter start_time item to correct place
Michael Niedermayer [Wed, 21 Aug 2013 12:29:15 +0000 (14:29 +0200)]
doc/filters: move fps filter start_time item to correct place

Fixes warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 21 Aug 2013 11:08:49 +0000 (13:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'
Michael Niedermayer [Wed, 21 Aug 2013 11:03:40 +0000 (13:03 +0200)]
Merge commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1'

* commit 'c18838f5eb7d7001a9dc653f5162868c04c1b2a1':
  h264_ps: Use more meaningful error values

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'
Michael Niedermayer [Wed, 21 Aug 2013 10:56:37 +0000 (12:56 +0200)]
Merge commit '330ad1f6a53a37dec228cb424ca57e1268fafc64'

* commit '330ad1f6a53a37dec228cb424ca57e1268fafc64':
  h264_ps: K&R formatting cosmetics

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'
Michael Niedermayer [Wed, 21 Aug 2013 10:32:15 +0000 (12:32 +0200)]
Merge commit '8fed466b0a7d636ae5035f9c6074fba9a621539b'

* commit '8fed466b0a7d636ae5035f9c6074fba9a621539b':
  h264_ps: Drop commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'
Michael Niedermayer [Wed, 21 Aug 2013 10:21:01 +0000 (12:21 +0200)]
Merge commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b'

* commit 'c4e43560fe6677e9d60bfb3cffc41c7324e92a0b':
  h264data: Move some tables to the only place they are used

Conflicts:
libavcodec/h264data.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce'
Michael Niedermayer [Wed, 21 Aug 2013 10:12:04 +0000 (12:12 +0200)]
Merge commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce'

* commit 'f34de1486aa0eb147d46ba5d2cb86a17407bb7ce':
  h264data: Remove unused luma_dc_field_scan table

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'
Michael Niedermayer [Wed, 21 Aug 2013 09:45:03 +0000 (11:45 +0200)]
Merge commit '4f2b469da5e4ae221718ae479f6af627cfdebb91'

* commit '4f2b469da5e4ae221718ae479f6af627cfdebb91':
  Add a libfdk-aac decoder

Conflicts:
configure
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'
Michael Niedermayer [Wed, 21 Aug 2013 09:37:10 +0000 (11:37 +0200)]
Merge commit '545a0b807cf45b2bbc4c9087a297b741ce00f508'

* commit '545a0b807cf45b2bbc4c9087a297b741ce00f508':
  vf_fps: add 'start_time' option

Conflicts:
doc/filters.texi
libavfilter/vf_fps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2a61592573d725956a4377641344afe263382648'
Michael Niedermayer [Wed, 21 Aug 2013 09:18:43 +0000 (11:18 +0200)]
Merge commit '2a61592573d725956a4377641344afe263382648'

* commit '2a61592573d725956a4377641344afe263382648':
  avcodec: Remove some commented-out debug cruft

Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mvpred.h
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'
Michael Niedermayer [Wed, 21 Aug 2013 08:59:02 +0000 (10:59 +0200)]
Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'

* commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb':
  movenc: Allow chapters to be written in trailer

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'
Michael Niedermayer [Wed, 21 Aug 2013 08:45:23 +0000 (10:45 +0200)]
Merge commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8'

* commit 'db03cb37fd9650b4a7c752d24a2e84ff27508ee8':
  movenc: Allow chapter track in default MODE_MP4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '64af59bc4916fac5578b31c89da13c30b591bddf'
Michael Niedermayer [Wed, 21 Aug 2013 08:38:19 +0000 (10:38 +0200)]
Merge commit '64af59bc4916fac5578b31c89da13c30b591bddf'

* commit '64af59bc4916fac5578b31c89da13c30b591bddf':
  avformat: Fix references to removed av_close_input_file in Doxygen

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM
Diego Biurrun [Tue, 20 Aug 2013 12:24:04 +0000 (14:24 +0200)]
avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM

6 years agoavformat/unix: reshuffle #includes
Michael Niedermayer [Wed, 21 Aug 2013 03:46:34 +0000 (05:46 +0200)]
avformat/unix: reshuffle #includes

This should fix openbsd while hopefully also working on solaris & android

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/unix: include sys/socket.h
Michael Niedermayer [Tue, 20 Aug 2013 22:25:51 +0000 (00:25 +0200)]
avformat/unix: include sys/socket.h

unbreak android ndk r8 build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/flashsv: check diff_start/height
Michael Niedermayer [Tue, 20 Aug 2013 21:18:48 +0000 (23:18 +0200)]
avcodec/flashsv: check diff_start/height

Fixes out of array accesses
Fixes Ticket2844

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_ps: Use more meaningful error values
Diego Biurrun [Mon, 19 Aug 2013 13:18:49 +0000 (15:18 +0200)]
h264_ps: Use more meaningful error values

6 years agoh264_ps: K&R formatting cosmetics
Diego Biurrun [Mon, 19 Aug 2013 13:16:05 +0000 (15:16 +0200)]
h264_ps: K&R formatting cosmetics

6 years agoh264_ps: Drop commented-out cruft
Diego Biurrun [Mon, 19 Aug 2013 13:22:06 +0000 (15:22 +0200)]
h264_ps: Drop commented-out cruft

6 years agoh264data: Move some tables to the only place they are used
Diego Biurrun [Mon, 19 Aug 2013 10:44:58 +0000 (12:44 +0200)]
h264data: Move some tables to the only place they are used

6 years agoh264data: Remove unused luma_dc_field_scan table
Diego Biurrun [Mon, 19 Aug 2013 10:43:17 +0000 (12:43 +0200)]
h264data: Remove unused luma_dc_field_scan table

6 years agoAdd a libfdk-aac decoder
Martin Storsjö [Thu, 15 Aug 2013 19:40:32 +0000 (15:40 -0400)]
Add a libfdk-aac decoder

This can be useful for decoding AAC object types that are not supported
by the native AAC decoder, e.g. AAC-LD and AAC-ELD.

6 years agovf_fps: add 'start_time' option
Justin Ruggles [Thu, 15 Aug 2013 20:14:57 +0000 (16:14 -0400)]
vf_fps: add 'start_time' option

This allows for dropping or duplication to match a particular start time.

6 years agoavcodec: Remove some commented-out debug cruft
Diego Biurrun [Tue, 20 Aug 2013 12:25:33 +0000 (14:25 +0200)]
avcodec: Remove some commented-out debug cruft

6 years agofate: Add EXIF test.
Thilo Borgmann [Tue, 20 Aug 2013 13:53:42 +0000 (15:53 +0200)]
fate: Add EXIF test.

6 years agoswr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output
Michael Niedermayer [Tue, 20 Aug 2013 14:56:51 +0000 (16:56 +0200)]
swr/rematrix: Fix handling of AV_CH_LAYOUT_STEREO_DOWNMIX output

Fixes Ticket2859

Note, testcases related to the downmix channels are welcome.
(id like to make sure this is working correctly now, as obviously it didnt
 work before ...)

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