ffmpeg.git
5 years agoMerge commit 'b5aa48551300eed678aaea86ced7086758598a35'
Michael Niedermayer [Wed, 28 May 2014 12:53:31 +0000 (14:53 +0200)]
Merge commit 'b5aa48551300eed678aaea86ced7086758598a35'

* commit 'b5aa48551300eed678aaea86ced7086758598a35':
  ppc: Move vec_unaligned_load macro to util_altivec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '593886b5dd2b583657aa3fd80bb173f702c9710d'
Michael Niedermayer [Wed, 28 May 2014 12:44:26 +0000 (14:44 +0200)]
Merge commit '593886b5dd2b583657aa3fd80bb173f702c9710d'

* commit '593886b5dd2b583657aa3fd80bb173f702c9710d':
  ppc: util_altivec: Drop unused macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'
Michael Niedermayer [Wed, 28 May 2014 11:19:26 +0000 (13:19 +0200)]
Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'

* commit '106b62f4ba600f24415eaded5e020aeceb23fd59':
  matroskaenc: write the channel mask for FLAC

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'efcde917af407a6031ecff68edd51fce7b83d104'
Michael Niedermayer [Wed, 28 May 2014 11:08:50 +0000 (13:08 +0200)]
Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'

* commit 'efcde917af407a6031ecff68edd51fce7b83d104':
  vorbiscomment: simplify API by using av_dict_count()

Conflicts:
libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
Michael Niedermayer [Wed, 28 May 2014 11:01:41 +0000 (13:01 +0200)]
Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'

* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
  matroskadec: parse the channel layout mask for FLAC

Conflicts:
libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'
Michael Niedermayer [Wed, 28 May 2014 10:49:28 +0000 (12:49 +0200)]
Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'

* commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0':
  matroskadec: export just the STREAMINFO block as FLAC extradata

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'
Michael Niedermayer [Wed, 28 May 2014 10:41:35 +0000 (12:41 +0200)]
Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'

* commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c':
  matroskadec: split parsing tracks into a separate function

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'
Michael Niedermayer [Wed, 28 May 2014 10:33:07 +0000 (12:33 +0200)]
Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'

* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
  flac: make avpriv_flac_parse_block_header() inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: Move vec_unaligned_load macro to util_altivec
Diego Biurrun [Wed, 28 May 2014 10:29:33 +0000 (03:29 -0700)]
ppc: Move vec_unaligned_load macro to util_altivec

This allows reusing it from multiple files.

5 years agoMerge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'
Michael Niedermayer [Wed, 28 May 2014 10:28:23 +0000 (12:28 +0200)]
Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'

* commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c':
  flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

Conflicts:
libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd'
Michael Niedermayer [Wed, 28 May 2014 10:20:44 +0000 (12:20 +0200)]
Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd'

* commit 'd6b9ce99ea384fb676561461768b8316725a4ccd':
  flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'
Michael Niedermayer [Wed, 28 May 2014 10:09:42 +0000 (12:09 +0200)]
Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'

* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362':
  flacdec: do not overwrite a channel layout set by the caller

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoppc: util_altivec: Drop unused macros
Diego Biurrun [Wed, 28 May 2014 10:11:24 +0000 (03:11 -0700)]
ppc: util_altivec: Drop unused macros

5 years agomatroskaenc: write the channel mask for FLAC
Anton Khirnov [Mon, 26 May 2014 11:53:13 +0000 (13:53 +0200)]
matroskaenc: write the channel mask for FLAC

5 years agovorbiscomment: simplify API by using av_dict_count()
Anton Khirnov [Mon, 26 May 2014 11:30:10 +0000 (13:30 +0200)]
vorbiscomment: simplify API by using av_dict_count()

5 years agomatroskadec: parse the channel layout mask for FLAC
Anton Khirnov [Mon, 26 May 2014 10:48:56 +0000 (12:48 +0200)]
matroskadec: parse the channel layout mask for FLAC

It is commonly stored in a vorbiscomment block in codec private data.

5 years agomatroskadec: export just the STREAMINFO block as FLAC extradata
Anton Khirnov [Sun, 25 May 2014 12:05:51 +0000 (14:05 +0200)]
matroskadec: export just the STREAMINFO block as FLAC extradata

It contains all information that is used by the decoder and the other
FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.

5 years agomatroskadec: split parsing tracks into a separate function
Anton Khirnov [Sun, 25 May 2014 07:07:32 +0000 (09:07 +0200)]
matroskadec: split parsing tracks into a separate function

5 years agoflac: make avpriv_flac_parse_block_header() inline
Anton Khirnov [Mon, 26 May 2014 07:43:50 +0000 (09:43 +0200)]
flac: make avpriv_flac_parse_block_header() inline

This avoids all the ABI troubles associated with avpriv_.
Since this function is very small and does not depend on any tables,
making it inline should have no adverse effects.

5 years agoflac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files
Anton Khirnov [Sun, 25 May 2014 09:34:32 +0000 (11:34 +0200)]
flac muxer: write WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag for multichannel files

5 years agoflac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag
Anton Khirnov [Sun, 25 May 2014 09:14:14 +0000 (11:14 +0200)]
flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag

It is used to store the channel mask for non-standard layouts.

5 years agoflacdec: do not overwrite a channel layout set by the caller
Anton Khirnov [Sun, 25 May 2014 09:12:33 +0000 (11:12 +0200)]
flacdec: do not overwrite a channel layout set by the caller

The channel layout mask for non-standard layouts is typically stored at
the container level (as a vorbiscomment tag) for FLAC.

5 years agoffmpeg: add -devices param
Lukasz Marek [Tue, 27 May 2014 21:04:52 +0000 (23:04 +0200)]
ffmpeg: add -devices param

FFmpeg mix devices and file formats when -formats option is used.
This commit adds a -devices param to list devices only.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavformat/utils: Fix segfault on m4a cover artwork parsing
Lazaros Koromilas [Tue, 27 May 2014 11:38:44 +0000 (14:38 +0300)]
libavformat/utils: Fix segfault on m4a cover artwork parsing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoTimecode: Support 48fps
Thierry Foucu [Tue, 27 May 2014 18:23:09 +0000 (11:23 -0700)]
Timecode: Support 48fps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggenc: fix EOS flag
Michael Niedermayer [Tue, 27 May 2014 23:06:26 +0000 (01:06 +0200)]
avformat/oggenc: fix EOS flag

This corrects the bug that caused the checksums to change in
9767d7c092c890ecc5953452e8a951fd902dd67b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'
Michael Niedermayer [Tue, 27 May 2014 22:57:49 +0000 (00:57 +0200)]
Merge commit '9767d7c092c890ecc5953452e8a951fd902dd67b'

* commit '9767d7c092c890ecc5953452e8a951fd902dd67b':
  oggenc: Flush after writing headers

Conflicts:
tests/ref/lavf/ogg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1'
Michael Niedermayer [Tue, 27 May 2014 22:27:23 +0000 (00:27 +0200)]
Merge commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1'

* commit '1d3eb0b5735f6dd72d2bf648455cf06ac7c24bc1':
  oggenc: Move ogg_write_pages up above ogg_write_header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
Michael Niedermayer [Tue, 27 May 2014 22:03:59 +0000 (00:03 +0200)]
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'

* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
  dsputil: Split off HuffYUV encoding bits into their own context

Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/pngenc.c
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'
Michael Niedermayer [Tue, 27 May 2014 21:07:36 +0000 (23:07 +0200)]
Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'

* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvdec.c
libavcodec/lagarith.c
libavcodec/vble.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'
Michael Niedermayer [Tue, 27 May 2014 20:34:10 +0000 (22:34 +0200)]
Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'

* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
  h264_picture: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0'
Michael Niedermayer [Tue, 27 May 2014 20:29:07 +0000 (22:29 +0200)]
Merge commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0'

* commit 'f1df0a4c08b54e722e7a2c797d0d31c7f2c531d0':
  on2avc: Remove pointless dsputil.h #include

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rtspdec: Use av_mallocz_array()
Michael Niedermayer [Tue, 27 May 2014 18:30:56 +0000 (20:30 +0200)]
avformat/rtspdec: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vp3: use av_mallocz_array()
Michael Niedermayer [Tue, 27 May 2014 18:28:17 +0000 (20:28 +0200)]
avcodec/vp3: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cavs: use av_mallocz_array()
Michael Niedermayer [Tue, 27 May 2014 18:15:31 +0000 (20:15 +0200)]
avcodec/cavs: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters: amix only supports float samples
Lou Logan [Mon, 26 May 2014 20:41:38 +0000 (12:41 -0800)]
doc/filters: amix only supports float samples

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agooggenc: Flush after writing headers
Andrew Kelley [Mon, 26 May 2014 04:04:19 +0000 (21:04 -0700)]
oggenc: Flush after writing headers

Before, header information for ogg format files was sent with the
first encoded packet.

This patch makes it so that it is possible for API users to
differentiate between headers and encoded audio. This is useful, for
example, when creating an audio stream where you want to send one set
of headers for every client that connects and then the encoded stream
of audio.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agooggenc: Move ogg_write_pages up above ogg_write_header
Andrew Kelley [Mon, 26 May 2014 04:04:19 +0000 (21:04 -0700)]
oggenc: Move ogg_write_pages up above ogg_write_header

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 16:22:09 +0000 (18:22 +0200)]
avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodsputil: Split off HuffYUV encoding bits into their own context
Diego Biurrun [Mon, 23 Dec 2013 17:42:11 +0000 (18:42 +0100)]
dsputil: Split off HuffYUV encoding bits into their own context

Also shorten HuffYUV context member names to avoid clutter.

5 years agodsputil: Split off HuffYUV decoding bits into their own context
Diego Biurrun [Tue, 7 Jan 2014 11:23:13 +0000 (12:23 +0100)]
dsputil: Split off HuffYUV decoding bits into their own context

Also shorten HuffYUV context member names to avoid clutter.

5 years agoavfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/il: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/il: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/hflip: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/hflip: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/crop: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/crop: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/formats: Avoid using non public AV_PIX_FMT_NB
Michael Niedermayer [Tue, 27 May 2014 15:43:03 +0000 (17:43 +0200)]
avfilter/formats: Avoid using non public AV_PIX_FMT_NB

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoImprove the detection of architecture x86.
Andreas Cadhalpun [Mon, 26 May 2014 16:07:55 +0000 (18:07 +0200)]
Improve the detection of architecture x86.

This fixes building on Debian GNU/Hurd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/dsputilenc: use HADDD in ff_sse16_sse2
James Almer [Tue, 27 May 2014 07:27:37 +0000 (04:27 -0300)]
x86/dsputilenc: use HADDD in ff_sse16_sse2

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_picture: Remove pointless dsputil.h #include
Diego Biurrun [Fri, 23 May 2014 14:20:58 +0000 (07:20 -0700)]
h264_picture: Remove pointless dsputil.h #include

5 years agoon2avc: Remove pointless dsputil.h #include
Diego Biurrun [Fri, 23 May 2014 14:20:24 +0000 (07:20 -0700)]
on2avc: Remove pointless dsputil.h #include

5 years agox86/dsputilenc: implement SSE2 version of diff_pixels
James Almer [Mon, 26 May 2014 06:49:35 +0000 (03:49 -0300)]
x86/dsputilenc: implement SSE2 version of diff_pixels

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/x86/dsputilenc: set the count of SSE registers correctly for get_pixels
Michael Niedermayer [Tue, 27 May 2014 03:51:42 +0000 (05:51 +0200)]
avcodec/x86/dsputilenc: set the count of SSE registers correctly for get_pixels

Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156'
Michael Niedermayer [Tue, 27 May 2014 01:22:45 +0000 (03:22 +0200)]
Merge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156'

* commit '7cc4c9f32f446feaec5447e3d097e8147e35f156':
  lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'
Michael Niedermayer [Tue, 27 May 2014 01:12:49 +0000 (03:12 +0200)]
Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'

* commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444':
  buffersrc: avoid using AV_PIX_FMT_NB

Conflicts:
libavfilter/buffersrc.c

No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d90a16bdb0ece6f5c67e12167a67a0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'
Michael Niedermayer [Tue, 27 May 2014 01:02:09 +0000 (03:02 +0200)]
Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'

* commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3':
  vf_fieldorder: avoid using AV_PIX_FMT_NB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'
Michael Niedermayer [Tue, 27 May 2014 00:54:58 +0000 (02:54 +0200)]
Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'

* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
  vf_scale: use the pixfmt descriptor API

Conflicts:
libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_format: fix duplicate ;
Michael Niedermayer [Tue, 27 May 2014 00:53:17 +0000 (02:53 +0200)]
avfilter/vf_format: fix duplicate ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'
Michael Niedermayer [Tue, 27 May 2014 00:46:56 +0000 (02:46 +0200)]
Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'

* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
  vf_format: rework format list parsing

Conflicts:
libavfilter/vf_format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d8c28deab2488579f585406110b1be790896e59'
Michael Niedermayer [Tue, 27 May 2014 00:26:45 +0000 (02:26 +0200)]
Merge commit '4d8c28deab2488579f585406110b1be790896e59'

* commit '4d8c28deab2488579f585406110b1be790896e59':
  imgutils: make systematic palette opaque.

Conflicts:
libavutil/imgutils.c

See: 4d8c28deab2488579f585406110b1be790896e59
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: set max analyze duration depending on the circumstances
Michael Niedermayer [Mon, 26 May 2014 20:10:41 +0000 (22:10 +0200)]
avformat/utils: set max analyze duration depending on the circumstances

Fixes Ticket3673

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: move default for max_analyze_duration into utils.c
Michael Niedermayer [Mon, 26 May 2014 19:54:27 +0000 (21:54 +0200)]
avformat: move default for max_analyze_duration into utils.c

this way we can do better tha a single fixed constant value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB
Anton Khirnov [Sat, 24 May 2014 09:15:15 +0000 (11:15 +0200)]
lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB

Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.

5 years agobuffersrc: avoid using AV_PIX_FMT_NB
Anton Khirnov [Sat, 24 May 2014 09:15:15 +0000 (11:15 +0200)]
buffersrc: avoid using AV_PIX_FMT_NB

That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.

5 years agovf_fieldorder: avoid using AV_PIX_FMT_NB
Anton Khirnov [Sat, 24 May 2014 09:15:15 +0000 (11:15 +0200)]
vf_fieldorder: avoid using AV_PIX_FMT_NB

That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.

5 years agovf_scale: use the pixfmt descriptor API
Anton Khirnov [Sat, 24 May 2014 09:15:15 +0000 (11:15 +0200)]
vf_scale: use the pixfmt descriptor API

Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.

5 years agovf_format: rework format list parsing
Anton Khirnov [Sat, 24 May 2014 09:15:15 +0000 (11:15 +0200)]
vf_format: rework format list parsing

Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.

5 years agoMAINTAINERS: add Trac maintainers
Lou Logan [Mon, 26 May 2014 20:18:29 +0000 (12:18 -0800)]
MAINTAINERS: add Trac maintainers

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agodoc/ffmpeg: note that -t is also an input option
Lou Logan [Mon, 7 Apr 2014 19:59:51 +0000 (11:59 -0800)]
doc/ffmpeg: note that -t is also an input option

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agoconfigure: s/solving/solve
Lou Logan [Mon, 26 May 2014 19:54:35 +0000 (11:54 -0800)]
configure: s/solving/solve

Signed-off-by: Lou Logan <lou@lrcd.com>
5 years agodoc: add a tutorial for writing filters.
Clément Bœsch [Sat, 3 May 2014 22:56:59 +0000 (00:56 +0200)]
doc: add a tutorial for writing filters.

5 years agoavcodec/g723_1: fix writing into input frame data and warning
Michael Niedermayer [Mon, 26 May 2014 18:37:34 +0000 (20:37 +0200)]
avcodec/g723_1: fix writing into input frame data and warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoWrite the actual mp3 frame size when muxing into caf if available.
Carl Eugen Hoyos [Mon, 26 May 2014 17:06:23 +0000 (19:06 +0200)]
Write the actual mp3 frame size when muxing into caf if available.

Fixes ticket #3648.

5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Mon, 26 May 2014 14:35:47 +0000 (16:35 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  ffmpeg: use thread message API.
  lavu: add thread message API.
  compat/w32pthreads: add return value to pthread_cond_init().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: uClibc native pthread requires -ldl
Neil Armstrong [Mon, 26 May 2014 13:21:03 +0000 (15:21 +0200)]
configure: uClibc native pthread requires -ldl

In the configure script, add a pthread detection with
-ldl added to cflags, because uClibc requires -ldl to
link with native libpthread.

Tested with a custom ARM toolchain with uClibc 0.9.33.2 and gcc 4.6.3.

Signed-off-by: Neil Armstrong <narmstrong@neotion.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hpeldsp: propagate changes across codecs
Christophe Gisquet [Sun, 25 May 2014 17:03:10 +0000 (19:03 +0200)]
x86: hpeldsp: propagate changes across codecs

Some codecs still use mmx versions, so have them use the versions
with newer instruction sets.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: use thread message API.
Nicolas George [Thu, 20 Feb 2014 13:14:53 +0000 (14:14 +0100)]
ffmpeg: use thread message API.

5 years agolavu: add thread message API.
Nicolas George [Thu, 20 Feb 2014 13:14:34 +0000 (14:14 +0100)]
lavu: add thread message API.

5 years agocompat/w32pthreads: add return value to pthread_cond_init().
Nicolas George [Mon, 21 Apr 2014 09:14:22 +0000 (11:14 +0200)]
compat/w32pthreads: add return value to pthread_cond_init().

5 years agoavformat/mov: allow seeking back to the begin even if nothing is marked as keyframe
Michael Niedermayer [Sun, 25 May 2014 23:23:16 +0000 (01:23 +0200)]
avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe

Fixes Ticket 3663

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fix typo in date
Michael Niedermayer [Sun, 25 May 2014 23:22:29 +0000 (01:22 +0200)]
doc/APIchanges: fix typo in date

5 years agoupdate APIchanges & version for c37d179
Michael Niedermayer [Sun, 25 May 2014 22:20:07 +0000 (00:20 +0200)]
update APIchanges & version for c37d179

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: add format_probesize to allow tuning the maximum amount of bytes to identif...
Michael Niedermayer [Mon, 27 Jan 2014 22:09:38 +0000 (23:09 +0100)]
avformat: add format_probesize to allow tuning the maximum amount of bytes to identify the filetype

Currently probesize is cliped at 1mb before being used for format detection.
Alternatively this cliping could be removed but this would then tie various
things like stream analysis to the file detection.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/sgirledec: fix () in RBG323_TO_BGR8() macro
Michael Niedermayer [Sun, 25 May 2014 21:08:51 +0000 (23:08 +0200)]
avcodec/sgirledec: fix () in RBG323_TO_BGR8() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv34: Fix () in GET_PTS_DIFF() macro
Michael Niedermayer [Sun, 25 May 2014 19:42:19 +0000 (21:42 +0200)]
avcodec/rv34: Fix () in GET_PTS_DIFF() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/psymodel: Fix () in AAC_CUTOFF() macro
Michael Niedermayer [Sun, 25 May 2014 19:41:57 +0000 (21:41 +0200)]
avcodec/psymodel: Fix () in AAC_CUTOFF() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/proresenc_anatoliy: Fix () in macros
Michael Niedermayer [Sun, 25 May 2014 19:41:35 +0000 (21:41 +0200)]
avcodec/proresenc_anatoliy: Fix () in macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRevert "x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm"
Michael Niedermayer [Sun, 25 May 2014 17:42:18 +0000 (19:42 +0200)]
Revert "x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm"

This reverts commit ad733089b024e4a3ff8f024d247a032f79a50ac8.

breaks with --disable-yasm
revert requested by: Christophe Gisquet <christophe.gisquet@gmail.com>

5 years agoavcodec/msvideo1enc: Fix () in MKRGB555() macro
Michael Niedermayer [Sun, 25 May 2014 17:26:37 +0000 (19:26 +0200)]
avcodec/msvideo1enc: Fix () in MKRGB555() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/opus: Fix () in ROUND_MULL() macro
Michael Niedermayer [Sun, 25 May 2014 17:25:58 +0000 (19:25 +0200)]
avcodec/opus: Fix () in ROUND_MULL() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/opus_celt: Fix () in CELT_PVQ_V macro
Michael Niedermayer [Sun, 25 May 2014 17:25:29 +0000 (19:25 +0200)]
avcodec/opus_celt: Fix () in CELT_PVQ_V macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: fix () in OP_* macros
Michael Niedermayer [Sun, 25 May 2014 17:24:30 +0000 (19:24 +0200)]
avcodec/pngdec: fix () in OP_* macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm
Timothy Gu [Sat, 24 May 2014 00:18:09 +0000 (17:18 -0700)]
x86: dsputilenc: convert ff_sse{8, 16}_mmx() to yasm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: try to fix the disappearing "r" bug in fate
Michael Niedermayer [Sun, 25 May 2014 13:44:27 +0000 (15:44 +0200)]
configure: try to fix the disappearing "r" bug in fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'
Michael Niedermayer [Sun, 25 May 2014 11:07:27 +0000 (13:07 +0200)]
Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'

* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
  smoothstream: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/webvttenc: do not use EOVERFLOW.
Clément Bœsch [Sun, 25 May 2014 08:27:33 +0000 (10:27 +0200)]
avcodec/webvttenc: do not use EOVERFLOW.

According to doc/errno.txt EOVERFLOW is not available everywhere. The
use of -1 is consistent with avcodec/srtenc.c.