]> git.sesse.net Git - ffmpeg/log
ffmpeg
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 7 Oct 2012 09:23:29 +0000 (11:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmaenc: use float planar sample format
  (e)ac3enc: use planar sample format
  aacenc: use planar sample format
  adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt
  adpcmenc: move 'ch' variable to higher scope
  adpcmenc: fix 3 instances of variable shadowing
  adpcm_ima_wav: simplify encoding
  libvorbis: use planar sample format
  libmp3lame: use planar sample formats
  vorbisenc: use float planar sample format
  ffm: do not write or read the audio sample format
  parseutils: fix parsing of invalid alpha values
  doc/RELEASE_NOTES: update for the 9 release.
  smoothstreamingenc: Add a more verbose error message
  smoothstreamingenc: Ignore the return value from mkdir
  smoothstreamingenc: Try writing a manifest when opening the muxer
  smoothstreamingenc: Move the output_chunk_list and write_manifest functions up
  smoothstreamingenc: Properly return errors from ism_flush to the caller
  smoothstreamingenc: Check the output UrlContext before accessing it

Conflicts:
doc/RELEASE_NOTES
libavcodec/aacenc.c
libavcodec/ac3enc_template.c
libavcodec/wmaenc.c
tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomovenc: support an alternative to edit lists to handle the first DTS != 0 case.
Michael Niedermayer [Sat, 29 Sep 2012 04:33:32 +0000 (06:33 +0200)]
movenc: support an alternative to edit lists to handle the first DTS != 0 case.

Some software does not support edit lists at all, the adobe flash
player seems to be one of these. Which results in AV sync errors when
edit lists are used to adjust AV sync.

2nd try on implementing this, the first try had various issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomov: fix integer avoption types
Michael Niedermayer [Sun, 7 Oct 2012 01:16:38 +0000 (03:16 +0200)]
mov: fix integer avoption types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agompeg4videodec: fix integer avoption types
Michael Niedermayer [Sun, 7 Oct 2012 01:15:36 +0000 (03:15 +0200)]
mpeg4videodec: fix integer avoption types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolibvpcenc: fix flags voption types
Michael Niedermayer [Sun, 7 Oct 2012 01:14:15 +0000 (03:14 +0200)]
libvpcenc: fix flags voption types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264: fix integer avoption types
Michael Niedermayer [Sun, 7 Oct 2012 01:13:31 +0000 (03:13 +0200)]
h264: fix integer avoption types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agotests/Makefile: fix ffprobe-test.nut with target-exec
jamal [Sun, 7 Oct 2012 00:43:51 +0000 (02:43 +0200)]
tests/Makefile: fix ffprobe-test.nut with target-exec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agogmc_mmx: enable also for large pictures when emu edge isnt needed.
Michael Niedermayer [Sat, 6 Oct 2012 21:12:57 +0000 (23:12 +0200)]
gmc_mmx: enable also for large pictures when emu edge isnt needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodsputil_mmx: put optimized gmc code back and avoid a VLA without loosing features.
Michael Niedermayer [Sat, 6 Oct 2012 20:36:49 +0000 (22:36 +0200)]
dsputil_mmx: put optimized gmc code back and avoid a VLA without loosing features.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoget_bits: get_bits_long() support n=0 as the docs allow it
Michael Niedermayer [Sat, 6 Oct 2012 20:25:04 +0000 (22:25 +0200)]
get_bits: get_bits_long() support n=0 as the docs allow it

also the 0 case is indeed used in some code pathes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomovenc: fix regression with yuyv caused by c5f23d
Michael Niedermayer [Sat, 6 Oct 2012 18:19:05 +0000 (20:19 +0200)]
movenc: fix regression with yuyv caused by c5f23d

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agowmaenc: use float planar sample format
Justin Ruggles [Sat, 25 Aug 2012 17:44:30 +0000 (13:44 -0400)]
wmaenc: use float planar sample format

11 years ago(e)ac3enc: use planar sample format
Justin Ruggles [Sat, 25 Aug 2012 17:11:10 +0000 (13:11 -0400)]
(e)ac3enc: use planar sample format

11 years agoaacenc: use planar sample format
Justin Ruggles [Sat, 25 Aug 2012 17:04:33 +0000 (13:04 -0400)]
aacenc: use planar sample format

11 years agovf_tile: fix typos/grammar in comments
Bobby Bingham [Sat, 6 Oct 2012 16:32:42 +0000 (11:32 -0500)]
vf_tile: fix typos/grammar in comments

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
11 years agoadpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt
Justin Ruggles [Sat, 25 Aug 2012 13:13:50 +0000 (09:13 -0400)]
adpcmenc: use planar sample format for adpcm_ima_wav and adpcm_ima_qt

11 years agoadpcmenc: move 'ch' variable to higher scope
Justin Ruggles [Sat, 25 Aug 2012 13:00:50 +0000 (09:00 -0400)]
adpcmenc: move 'ch' variable to higher scope

It is used for multiple codecs.

11 years agoadpcmenc: fix 3 instances of variable shadowing
Justin Ruggles [Sat, 25 Aug 2012 04:40:37 +0000 (00:40 -0400)]
adpcmenc: fix 3 instances of variable shadowing

11 years agoadpcm_ima_wav: simplify encoding
Justin Ruggles [Sat, 25 Aug 2012 04:39:17 +0000 (00:39 -0400)]
adpcm_ima_wav: simplify encoding

11 years agolibvorbis: use planar sample format
Justin Ruggles [Thu, 23 Aug 2012 17:47:09 +0000 (13:47 -0400)]
libvorbis: use planar sample format

11 years agolibmp3lame: use planar sample formats
Justin Ruggles [Wed, 22 Aug 2012 16:23:21 +0000 (12:23 -0400)]
libmp3lame: use planar sample formats

11 years agovorbisenc: use float planar sample format
Justin Ruggles [Mon, 20 Aug 2012 17:25:27 +0000 (13:25 -0400)]
vorbisenc: use float planar sample format

11 years agoffm: do not write or read the audio sample format
Justin Ruggles [Mon, 1 Oct 2012 05:24:57 +0000 (01:24 -0400)]
ffm: do not write or read the audio sample format

11 years agoparseutils: fix parsing of invalid alpha values
Mans Rullgard [Sat, 6 Oct 2012 09:21:22 +0000 (10:21 +0100)]
parseutils: fix parsing of invalid alpha values

An alpha specifier outside the valid range results in a conversion from
double to long with undefined result.  Range-checking the double and
only converting it after it passes avoids this.

Fixes fate-parseutils errors on some systems.

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agoconfigure: enable -Werror=vla
Michael Niedermayer [Sat, 6 Oct 2012 12:03:32 +0000 (14:03 +0200)]
configure: enable  -Werror=vla

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agopca: get rid of VLA
Michael Niedermayer [Sat, 6 Oct 2012 12:03:15 +0000 (14:03 +0200)]
pca: get rid of VLA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosnowenc: get rid of VLA (well it wasnt really variable anyway)
Michael Niedermayer [Sat, 6 Oct 2012 11:59:35 +0000 (13:59 +0200)]
snowenc: get rid of VLA (well it wasnt really variable anyway)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/RELEASE_NOTES: update for the 9 release.
Anton Khirnov [Fri, 5 Oct 2012 05:27:33 +0000 (07:27 +0200)]
doc/RELEASE_NOTES: update for the 9 release.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
11 years agoswr-test: avoid VLA
Michael Niedermayer [Sat, 6 Oct 2012 11:48:47 +0000 (13:48 +0200)]
swr-test: avoid VLA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 6 Oct 2012 11:23:05 +0000 (13:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  yuv4mpeg: return proper error codes.
  Give all anonymously typedeffed structs in headers a name
  fate: Add parseutils test
  parseutils-test: Drop random colors from parsing test
  vf_pad/scale: use double precision for aspect ratios.
  build: error on variable-length arrays
  ppc: swscale: rework yuv2planeX_altivec()
  ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
  x86: dsputil: kill VLA in gmc_mmx()
  libspeexenc: Updated commentary to reflect recent changes
  libspeexenc: Add an option for enabling DTX
  doc/APIchanges: fill in missing dates and hashes.
  lavr: bump major to 1 and declare it stable.
  lavr: change the type of the data buffers to uint8_t**.
  lavc: deprecate the audio resampling API.

Conflicts:
cmdutils.h
configure
doc/APIchanges
ffplay.c
libavcodec/dwt.h
libavcodec/libspeexenc.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavformat/asf.h
tests/fate/libavutil.mak
tests/ref/fate/parseutils

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/filters: fix typo
Stefano Sabatini [Sat, 6 Oct 2012 10:52:18 +0000 (12:52 +0200)]
doc/filters: fix typo

11 years agosegment: reverse pass avoid_negative_ts from the muxer
Michael Niedermayer [Sat, 6 Oct 2012 10:07:26 +0000 (12:07 +0200)]
segment: reverse pass avoid_negative_ts from the muxer

This fixes failures with formats not supporting negative TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosmoothstreamingenc: Add a more verbose error message
Martin Storsjö [Fri, 5 Oct 2012 23:39:21 +0000 (02:39 +0300)]
smoothstreamingenc: Add a more verbose error message

This helps tracking down the cause if this happens to be an issue.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agosmoothstreamingenc: Ignore the return value from mkdir
Martin Storsjö [Fri, 5 Oct 2012 23:33:32 +0000 (02:33 +0300)]
smoothstreamingenc: Ignore the return value from mkdir

We don't need to return an error if the directory already existed.
We make sure that the directory actually is properly writeable later
within ism_write_header by writing a manifest anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agosmoothstreamingenc: Try writing a manifest when opening the muxer
Martin Storsjö [Fri, 5 Oct 2012 23:30:18 +0000 (02:30 +0300)]
smoothstreamingenc: Try writing a manifest when opening the muxer

This allows failing cleaner and earlier if unable to write to
the output directory.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agosmoothstreamingenc: Move the output_chunk_list and write_manifest functions up
Martin Storsjö [Fri, 5 Oct 2012 23:27:49 +0000 (02:27 +0300)]
smoothstreamingenc: Move the output_chunk_list and write_manifest functions up

This allows calling write_manifest from ism_write_header without
a forward declaration.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agosmoothstreamingenc: Properly return errors from ism_flush to the caller
Martin Storsjö [Fri, 5 Oct 2012 23:33:06 +0000 (02:33 +0300)]
smoothstreamingenc: Properly return errors from ism_flush to the caller

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agosmoothstreamingenc: Check the output UrlContext before accessing it
Martin Storsjö [Fri, 5 Oct 2012 23:24:07 +0000 (02:24 +0300)]
smoothstreamingenc: Check the output UrlContext before accessing it

This code can be called with a NULL UrlContext if writing of the
trailer involves seeking.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agolibvorbisenc: fix afq delay setting
Michael Niedermayer [Sat, 6 Oct 2012 09:50:38 +0000 (11:50 +0200)]
libvorbisenc: fix afq delay setting

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoyuv4mpeg: return proper error codes.
Anton Khirnov [Fri, 5 Oct 2012 13:53:32 +0000 (15:53 +0200)]
yuv4mpeg: return proper error codes.

Fixes Bug 373.

CC:libav-stable@libav.org

11 years agoGive all anonymously typedeffed structs in headers a name
Diego Biurrun [Thu, 27 Sep 2012 08:19:53 +0000 (10:19 +0200)]
Give all anonymously typedeffed structs in headers a name

Anonymous structs cannot be forward declared and have no benefit.

11 years agofate: Add parseutils test
Diego Biurrun [Fri, 5 Oct 2012 21:34:52 +0000 (23:34 +0200)]
fate: Add parseutils test

11 years agoparseutils-test: Drop random colors from parsing test
Diego Biurrun [Fri, 5 Oct 2012 21:33:02 +0000 (23:33 +0200)]
parseutils-test: Drop random colors from parsing test

This guarantees stable output for comparing test results.

11 years agovf_pad/scale: use double precision for aspect ratios.
Anton Khirnov [Fri, 5 Oct 2012 12:45:30 +0000 (14:45 +0200)]
vf_pad/scale: use double precision for aspect ratios.

Fixes Bug 203.

CC:libav-stable@libav.org

11 years agoPinnacle TARGA CineWave YUV16 decoder (fourcc Y216).
Carl Eugen Hoyos [Sat, 6 Oct 2012 04:20:52 +0000 (06:20 +0200)]
Pinnacle TARGA CineWave YUV16 decoder (fourcc Y216).

Fixes ticket #1354

11 years agompegvideo_armv5te: change asserts to av_asserts
Michael Niedermayer [Sat, 6 Oct 2012 02:45:57 +0000 (04:45 +0200)]
mpegvideo_armv5te: change asserts to av_asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffv1enc: fix assert in put_vlc_symbol() and update to av_assert2()
Michael Niedermayer [Sat, 6 Oct 2012 01:29:37 +0000 (03:29 +0200)]
ffv1enc: fix assert in put_vlc_symbol() and update to av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffv1: change w/h asserts to check as the condition can likely happen
Michael Niedermayer [Sat, 6 Oct 2012 01:12:25 +0000 (03:12 +0200)]
ffv1: change w/h asserts to check as the condition can likely happen

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffv1: remove commented asserts
Michael Niedermayer [Sat, 6 Oct 2012 01:11:33 +0000 (03:11 +0200)]
ffv1: remove commented asserts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoChangelog: add empty line after version lines
Stefano Sabatini [Fri, 5 Oct 2012 22:05:40 +0000 (00:05 +0200)]
Changelog: add empty line after version lines

Fix spacing inconsistency.

11 years agoffprobe: reindent after previous commit
Stefano Sabatini [Fri, 5 Oct 2012 21:56:39 +0000 (23:56 +0200)]
ffprobe: reindent after previous commit

11 years agoffprobe: add -select_streams option
Stefano Sabatini [Thu, 4 Oct 2012 15:38:43 +0000 (17:38 +0200)]
ffprobe: add -select_streams option

11 years agobuild: error on variable-length arrays
Mans Rullgard [Wed, 3 Oct 2012 22:00:44 +0000 (23:00 +0100)]
build: error on variable-length arrays

With all the VLAs gone, make sure they never come back.

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agoppc: swscale: rework yuv2planeX_altivec()
Mans Rullgard [Thu, 4 Oct 2012 16:30:34 +0000 (17:30 +0100)]
ppc: swscale: rework yuv2planeX_altivec()

This gets rid of the variable-length scratch buffer by filtering 16
pixels at a time and writing directly to the destination.  The extra
loads this requires to load the source values are compensated by not
doing a round-trip to memory before shifting.

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agoppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
Mans Rullgard [Thu, 4 Oct 2012 00:26:50 +0000 (01:26 +0100)]
ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agox86: dsputil: kill VLA in gmc_mmx()
Mans Rullgard [Wed, 3 Oct 2012 21:53:00 +0000 (22:53 +0100)]
x86: dsputil: kill VLA in gmc_mmx()

Instead of using an evil VLA, fall back to C version when edge
emulation is needed.  MPEG4 GMC is a rarely used fringe feature
so the speed loss is an acceptable cost for safer code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agolibspeexenc: Updated commentary to reflect recent changes
Dmitry Samonenko [Thu, 4 Oct 2012 20:42:31 +0000 (00:42 +0400)]
libspeexenc: Updated commentary to reflect recent changes

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agolibspeexenc: Add an option for enabling DTX
Dmitry Samonenko [Thu, 4 Oct 2012 20:36:16 +0000 (00:36 +0400)]
libspeexenc: Add an option for enabling DTX

Discontinuous transmission is an addition to VAD/VBR operation, that
allows to greatly reduce bitrate for silent chunks or stationary
noises.

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agoFix libcdio detection.
Carl Eugen Hoyos [Fri, 5 Oct 2012 19:45:02 +0000 (21:45 +0200)]
Fix libcdio detection.

11 years agoDo not print debug output for the (MPlayer) pullup filter.
Carl Eugen Hoyos [Fri, 5 Oct 2012 19:03:59 +0000 (21:03 +0200)]
Do not print debug output for the (MPlayer) pullup filter.

11 years agoFix showspectrum dependencies: Add rdft.
Carl Eugen Hoyos [Fri, 5 Oct 2012 18:13:02 +0000 (20:13 +0200)]
Fix showspectrum dependencies: Add rdft.

11 years agoconfigure: dts demuxer needs dca_parser
Paul B Mahol [Fri, 5 Oct 2012 15:55:50 +0000 (15:55 +0000)]
configure: dts demuxer needs dca_parser

Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years agooggparsetheora: fix comment header parsing
Giorgio Vazzana [Fri, 5 Oct 2012 11:37:20 +0000 (13:37 +0200)]
oggparsetheora: fix comment header parsing

Pass the correct header size to ff_vorbis_comment()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 5 Oct 2012 15:02:15 +0000 (17:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: don't touch H264Context->ref_count[] during MB decoding
  x86: get_cpu_flags: add necessary ifdefs around function body
  x86: Drop CPU detection intrinsics
  x86: Add YASM implementations of cpuid and xgetbv from x264

Conflicts:
configure
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '65d12900432ac880d764edbbd36818431484a76e'
Michael Niedermayer [Fri, 5 Oct 2012 14:52:13 +0000 (16:52 +0200)]
Merge commit '65d12900432ac880d764edbbd36818431484a76e'

* commit '65d12900432ac880d764edbbd36818431484a76e':
  configure: add --enable-lto option
  x86: cpu: Break out test for cpuid capabilities into separate function
  x86: ff_get_cpu_flags_x86(): Avoid a pointless variable indirection
  build: Factor out mpegaudio dependencies to CONFIG_MPEGAUDIO
  segment: Add comments about calls that only are relevant for some muxers
  segment: Add an option for omitting the first header and final trailer

Conflicts:
configure
libavcodec/Makefile
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace'
Michael Niedermayer [Fri, 5 Oct 2012 14:37:41 +0000 (16:37 +0200)]
Merge commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace'

* commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace':
  segment: Flush buffered data before finishing a segment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'f7b240434c015056bc6319ddbdb8483757cc13e2'
Michael Niedermayer [Fri, 5 Oct 2012 14:30:21 +0000 (16:30 +0200)]
Merge commit 'f7b240434c015056bc6319ddbdb8483757cc13e2'

* commit 'f7b240434c015056bc6319ddbdb8483757cc13e2':
  segment: Set the resend_headers flag for each segment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'
Michael Niedermayer [Fri, 5 Oct 2012 14:14:06 +0000 (16:14 +0200)]
Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'

* commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e':
  segment: Add an option for disabling writing of a header/trailer to each segment

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'eb447d515956b3ce182d9750083131735f00324c'
Michael Niedermayer [Fri, 5 Oct 2012 13:41:45 +0000 (15:41 +0200)]
Merge commit 'eb447d515956b3ce182d9750083131735f00324c'

* commit 'eb447d515956b3ce182d9750083131735f00324c':
  segment: Free and reinit the muxer before calling avformat_write_header

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'
Michael Niedermayer [Fri, 5 Oct 2012 13:12:54 +0000 (15:12 +0200)]
Merge commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87'

* commit '73871dc96ff78053b9dcd0eb259b7f5a5308ec87':
  segment: Use the public av_write_header/av_write_trailer functions

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit '0edae4e6286096023cdd6adea74722fa06029867'
Michael Niedermayer [Fri, 5 Oct 2012 13:03:02 +0000 (15:03 +0200)]
Merge commit '0edae4e6286096023cdd6adea74722fa06029867'

* commit '0edae4e6286096023cdd6adea74722fa06029867':
  segment: Properly create new AVStreams for the chained muxer
  segment: Add a missing space

Conflicts:
libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agodoc/APIchanges: fill in missing dates and hashes.
Anton Khirnov [Fri, 5 Oct 2012 12:01:39 +0000 (14:01 +0200)]
doc/APIchanges: fill in missing dates and hashes.

11 years agolavr: bump major to 1 and declare it stable.
Anton Khirnov [Fri, 5 Oct 2012 04:59:22 +0000 (06:59 +0200)]
lavr: bump major to 1 and declare it stable.

11 years agolavr: change the type of the data buffers to uint8_t**.
Anton Khirnov [Fri, 5 Oct 2012 04:56:00 +0000 (06:56 +0200)]
lavr: change the type of the data buffers to uint8_t**.

This is more consistent with what the rest of Libav does.

This breaks API.

11 years agolavc: deprecate the audio resampling API.
Anton Khirnov [Fri, 5 Oct 2012 05:25:56 +0000 (07:25 +0200)]
lavc: deprecate the audio resampling API.

It has been superseded by lavr.

11 years agolavc/h264: don't touch H264Context->ref_count[] during MB decoding.
Ronald S. Bultje [Thu, 4 Oct 2012 07:01:45 +0000 (09:01 +0200)]
lavc/h264: don't touch H264Context->ref_count[] during MB decoding.

The variable is copied to subsequent threads at the same time, so this
may cause wrong ref_count[] values to be copied to subsequent threads.

This bug was found using TSAN and Helgrind.

Original patch by Ronald, adapted with a local_ref_count by Clément,
following the suggestion of Michael Niedermayer.

Signed-off-by: Clément Bœsch <clement.boesch@smartjog.com>
11 years agohls: Disable http seekability probing
Duncan Salerno [Tue, 2 Oct 2012 21:22:44 +0000 (22:22 +0100)]
hls: Disable http seekability probing

Some HLS servers return 403 when the Range header is present. Disabling http
seekability probing prevents the header from being added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agohttp: prevent the Range header being sent when seekability probing isnt used
Duncan Salerno [Tue, 2 Oct 2012 21:22:44 +0000 (22:22 +0100)]
http: prevent the Range header being sent when seekability probing isnt used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agohttp: add option to prevent probing for HTTP seekability
Duncan Salerno [Tue, 2 Oct 2012 21:22:44 +0000 (22:22 +0100)]
http: add option to prevent probing for HTTP seekability

Add an tri-state (seek, non seek, automatic detection) option to HTTP to control seekability (default: automatic).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agompeg2videodec: fix list of supported frame rates to include sane ext rates.
Michael Niedermayer [Fri, 5 Oct 2012 00:51:19 +0000 (02:51 +0200)]
mpeg2videodec: fix list of supported frame rates to include sane ext rates.

This only adds a subset of the frame rates that can be stored, a full list
would be more than 500 entries. Such full list could (and should) be added
if it has a usecase but the number of users of even the now added rates
seem rather small.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoh264: don't touch H264Context->ref_count[] during MB decoding
Ronald S. Bultje [Wed, 3 Oct 2012 23:25:14 +0000 (16:25 -0700)]
h264: don't touch H264Context->ref_count[] during MB decoding

The variable is copied to subsequent threads at the same time, so this
may cause wrong ref_count[] values to be copied to subsequent threads.

This bug was found using TSAN.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years agolibspeexenc: Updated commentary to reflect recent changes
Dmitry Samonenko [Thu, 4 Oct 2012 20:42:31 +0000 (00:42 +0400)]
libspeexenc: Updated commentary to reflect recent changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agolibspeexenc: Add an option for enabling DTX
Dmitry Samonenko [Thu, 4 Oct 2012 20:36:16 +0000 (00:36 +0400)]
libspeexenc: Add an option for enabling DTX

Discontinuous transmission is an addition to VAD/VBR operation, that
allows to greatly reduce bitrate for silent chunks or stationary
noises.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoaacenc: fix out of array writes
Michael Niedermayer [Thu, 4 Oct 2012 20:54:29 +0000 (22:54 +0200)]
aacenc: fix out of array writes

The value used in allocation is based on a estimate of the
maximum size of the spectral coefficients multiplied with 2
and rounded up. The exact or a tighter limit should be
found and used instead. But this issue shouldnt be left
open until someone works on that.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agomovenc.c: Add support for >16bit BE flavours
Tim Nicholson [Tue, 2 Oct 2012 10:18:04 +0000 (11:18 +0100)]
movenc.c: Add support for >16bit BE flavours

Currently only LE handled correctly
Updated fate checksums to reflect new headers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agox86: get_cpu_flags: add necessary ifdefs around function body
Diego Biurrun [Wed, 5 Sep 2012 18:49:28 +0000 (20:49 +0200)]
x86: get_cpu_flags: add necessary ifdefs around function body

ff_get_cpu_flags_x86() requires cpuid(), which is conditionally defined
elsewhere in the file.  Surrounding the function body with ifdefs allows
building even when cpuid is not defined.  An empty cpuflags mask is
returned in this case.

11 years agox86: Drop CPU detection intrinsics
Diego Biurrun [Wed, 3 Oct 2012 15:57:53 +0000 (17:57 +0200)]
x86: Drop CPU detection intrinsics

Now that there is CPU detection in YASM, there will always be one of
inline or external assembly enabled, which obviates the need to fall
back on CPU detection through compiler intrinsics.

11 years agox86: Add YASM implementations of cpuid and xgetbv from x264
Diego Biurrun [Wed, 3 Oct 2012 14:46:17 +0000 (16:46 +0200)]
x86: Add YASM implementations of cpuid and xgetbv from x264

This allows detecting CPU features with builds that have neither
gcc inline assembly nor the right compiler intrinsics enabled.

11 years agoconfigure: add --enable-lto option
Mans Rullgard [Thu, 20 Sep 2012 14:50:14 +0000 (15:50 +0100)]
configure: add --enable-lto option

This works with gcc.  Other compilers might need to have a flag
mapping added.

Signed-off-by: Mans Rullgard <mans@mansr.com>
11 years agox86: cpu: Break out test for cpuid capabilities into separate function
Diego Biurrun [Thu, 4 Oct 2012 12:01:26 +0000 (14:01 +0200)]
x86: cpu: Break out test for cpuid capabilities into separate function

11 years agox86: ff_get_cpu_flags_x86(): Avoid a pointless variable indirection
Diego Biurrun [Wed, 3 Oct 2012 22:40:05 +0000 (00:40 +0200)]
x86: ff_get_cpu_flags_x86(): Avoid a pointless variable indirection

11 years agobuild: Factor out mpegaudio dependencies to CONFIG_MPEGAUDIO
Diego Biurrun [Tue, 14 Aug 2012 00:09:15 +0000 (02:09 +0200)]
build: Factor out mpegaudio dependencies to CONFIG_MPEGAUDIO

A new hidden config variable is added for the codecs that depend on the
mpegaudio parts.

11 years agoffplay: autodetect realtime streams and enable infbuf
Michael Niedermayer [Thu, 4 Oct 2012 15:35:20 +0000 (17:35 +0200)]
ffplay: autodetect realtime streams and enable infbuf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoffplay: add a 3rd state to infbuf for autodetection
Michael Niedermayer [Thu, 4 Oct 2012 15:34:47 +0000 (17:34 +0200)]
ffplay: add a 3rd state to infbuf for autodetection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosegment: Add comments about calls that only are relevant for some muxers
Martin Storsjö [Thu, 4 Oct 2012 12:28:30 +0000 (15:28 +0300)]
segment: Add comments about calls that only are relevant for some muxers

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agompeg2enc: support and use frame_rate_ext when needed
Michael Niedermayer [Thu, 4 Oct 2012 13:25:30 +0000 (15:25 +0200)]
mpeg2enc: support and use frame_rate_ext when needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 4 Oct 2012 11:20:50 +0000 (13:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_overlay: properly sync inputs.

Conflicts:
libavfilter/vf_overlay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agoMerge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'
Michael Niedermayer [Thu, 4 Oct 2012 11:11:45 +0000 (13:11 +0200)]
Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'

* commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b':
  vf_overlay: get rid of pointless messing with timebase.
  samplefmt: make av_samples_alloc() initialize the data to silence.
  libspeexdec: handle NULL return value from speex_packet_to_header()
  h264probe: Don't error out on bits that no longer are reserved
  mpegvideo: set extended_data in ff_update_duplicate_context()
  libspeexdec: properly handle DTX for multiple frames-per-packet
  libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used
  libspeexdec: simplify setting of frame_size
  libspeexdec: set channel_layout

Conflicts:
libavfilter/vf_overlay.c
libavformat/h264dec.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years agosegment: Flush buffered data before finishing a segment
Martin Storsjö [Tue, 2 Oct 2012 21:56:40 +0000 (23:56 +0200)]
segment: Flush buffered data before finishing a segment

This makes sure any buffered data is written to the segment, for
muxers that buffer up data internally (e.g. fragmented mp4).

Signed-off-by: Martin Storsjö <martin@martin.st>
11 years agosegment: Set the resend_headers flag for each segment
Martin Storsjö [Tue, 2 Oct 2012 21:51:46 +0000 (23:51 +0200)]
segment: Set the resend_headers flag for each segment

This makes sure new inline headers are emitted when the next
packet is written. This allows segmenting mpegts without calling
write_header/write_trailer (nor freeing/reiniting the muxer)
for each segment.

Signed-off-by: Martin Storsjö <martin@martin.st>