ffmpeg.git
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Dec 2012 09:50:14 +0000 (10:50 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix segfault due to overlooked change needed in 14758e3
  x86inc: support stack mem allocation and re-alignment in PROLOGUE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86inc: support stack mem allocation and re-alignment in PROLOGUE.
Ronald S. Bultje [Sun, 9 Dec 2012 00:12:38 +0000 (16:12 -0800)]
x86inc: support stack mem allocation and re-alignment in PROLOGUE.

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '14758e3211d34a97c42b07acae117ce5627d7f57'
Michael Niedermayer [Wed, 12 Dec 2012 09:31:49 +0000 (10:31 +0100)]
Merge commit '14758e3211d34a97c42b07acae117ce5627d7f57'

* commit '14758e3211d34a97c42b07acae117ce5627d7f57':
  lavr: temporarily store custom matrix in AVAudioResampleContext
  lavr: clarify documentation for avresample_get/set_matrix()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'
Michael Niedermayer [Wed, 12 Dec 2012 09:16:19 +0000 (10:16 +0100)]
Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3'

* commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3':
  swfdec: cosmetics: fix indentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswfdec: print warning when len is cliped
Michael Niedermayer [Wed, 12 Dec 2012 09:01:43 +0000 (10:01 +0100)]
swfdec: print warning when len is cliped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix frame-rate documentation.
Carl Eugen Hoyos [Wed, 12 Dec 2012 09:08:43 +0000 (10:08 +0100)]
Fix frame-rate documentation.

6 years agoMerge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'
Michael Niedermayer [Wed, 12 Dec 2012 08:55:56 +0000 (09:55 +0100)]
Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'

* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
  swfdec: do better validation of tag length
  Make LOCAL_ALIGNED syntactically similar on all systems

Conflicts:
libavformat/swfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavr: fix segfault due to overlooked change needed in 14758e3
Justin Ruggles [Tue, 11 Dec 2012 20:56:17 +0000 (15:56 -0500)]
lavr: fix segfault due to overlooked change needed in 14758e3

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agox86inc: support stack mem allocation and re-alignment in PROLOGUE
Ronald S. Bultje [Sun, 9 Dec 2012 00:12:38 +0000 (16:12 -0800)]
x86inc: support stack mem allocation and re-alignment in PROLOGUE

Use this in VP8/H264-8bit loopfilter functions so they can be used if
there is no aligned stack (e.g. MSVC 32bit or ICC 10.x).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavfi/showinfo: check plane count before dereferencing.
Clément Bœsch [Wed, 12 Dec 2012 01:55:10 +0000 (02:55 +0100)]
lavfi/showinfo: check plane count before dereferencing.

6 years agoac3dec: fix out of array read
Michael Niedermayer [Wed, 12 Dec 2012 00:21:24 +0000 (01:21 +0100)]
ac3dec: fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocafdec: Check duration before use.
Michael Niedermayer [Tue, 11 Dec 2012 23:11:15 +0000 (00:11 +0100)]
cafdec: Check duration before use.

Fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobfi: fix division by 0
Michael Niedermayer [Tue, 11 Dec 2012 23:00:25 +0000 (00:00 +0100)]
bfi: fix division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog: update for soxr
Michael Niedermayer [Tue, 11 Dec 2012 21:22:59 +0000 (22:22 +0100)]
Changelog: update for soxr

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/ffmpeg: fix/extend documentation for -copyts
Stefano Sabatini [Wed, 21 Nov 2012 23:21:37 +0000 (00:21 +0100)]
doc/ffmpeg: fix/extend documentation for -copyts

6 years agoswr: Add SOX resampler support
Rob Sykes [Tue, 11 Dec 2012 20:43:42 +0000 (21:43 +0100)]
swr: Add SOX resampler support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: add a lowpass default so that each Resampler can have its own default.
Rob Sykes [Tue, 11 Dec 2012 20:23:24 +0000 (21:23 +0100)]
swr: add a lowpass default so that each Resampler can have its own default.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: move flush into Resampler
Michael Niedermayer [Tue, 11 Dec 2012 20:19:39 +0000 (21:19 +0100)]
swr: move flush into Resampler

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: make realloc_audio() available outside swresample.c
Michael Niedermayer [Tue, 11 Dec 2012 20:15:19 +0000 (21:15 +0100)]
swr: make realloc_audio() available outside swresample.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: Add API to make resample engine selectable.
Rob Sykes [Tue, 11 Dec 2012 17:36:58 +0000 (18:36 +0100)]
swr: Add API to make resample engine selectable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/utils: Do not require dimensions for PNG.
Michael Niedermayer [Tue, 11 Dec 2012 17:25:56 +0000 (18:25 +0100)]
lavc/utils: Do not require dimensions for PNG.

pngenc doesnt need them and mplayer doesnt set them.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: fix grammar mistake in setfield documentation
Stefano Sabatini [Tue, 11 Dec 2012 20:52:26 +0000 (21:52 +0100)]
doc/filters: fix grammar mistake in setfield documentation

Spotted-by: Tim Nicholson <nichot20@yahoo.com>
6 years agolavr: temporarily store custom matrix in AVAudioResampleContext
Justin Ruggles [Thu, 29 Nov 2012 19:53:04 +0000 (14:53 -0500)]
lavr: temporarily store custom matrix in AVAudioResampleContext

This allows AudioMix to be treated the same way as other conversion contexts
and removes the requirement to allocate it at the same time as the
AVAudioResampleContext.

The current matrix get/set functions are split between the public interface
and AudioMix private functions.

6 years agolavr: clarify documentation for avresample_get/set_matrix()
Justin Ruggles [Thu, 29 Nov 2012 19:59:19 +0000 (14:59 -0500)]
lavr: clarify documentation for avresample_get/set_matrix()

6 years agolavfi/fps: remove parse opt error message.
Clément Bœsch [Tue, 11 Dec 2012 17:14:08 +0000 (18:14 +0100)]
lavfi/fps: remove parse opt error message.

See cc650cf0 for more info.

6 years agodoc/filters: extend fps documentation.
Clément Bœsch [Tue, 11 Dec 2012 17:11:25 +0000 (18:11 +0100)]
doc/filters: extend fps documentation.

6 years agolavfi/fps: add shorthand.
Clément Bœsch [Tue, 11 Dec 2012 17:12:07 +0000 (18:12 +0100)]
lavfi/fps: add shorthand.

6 years agomxfdec: drop unneeded extradata padding
Michael Niedermayer [Tue, 11 Dec 2012 13:47:40 +0000 (14:47 +0100)]
mxfdec: drop unneeded extradata padding

Found-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswfdec: cosmetics: fix indentation
Justin Ruggles [Mon, 10 Dec 2012 17:48:18 +0000 (12:48 -0500)]
swfdec: cosmetics: fix indentation

6 years agoswfdec: do better validation of tag length
Justin Ruggles [Mon, 10 Dec 2012 17:44:09 +0000 (12:44 -0500)]
swfdec: do better validation of tag length

Avoids trying to read a packet with 0 or negative size.
Avoids a potential infinite loop due to seeking backwards.

Partially based on a patch by Michael Niedermayer.

6 years agomxfdec: fix leak of extradata
Michael Niedermayer [Tue, 11 Dec 2012 13:43:47 +0000 (14:43 +0100)]
mxfdec: fix leak of extradata

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMake LOCAL_ALIGNED syntactically similar on all systems
Mans Rullgard [Fri, 7 Dec 2012 23:03:01 +0000 (23:03 +0000)]
Make LOCAL_ALIGNED syntactically similar on all systems

This changes the LOCAL_ALIGNED definition on systems where
DECLARE_ALIGNED is used so it matches the manual alignment
case, ensuring invalid use will not compile on x86 only to
fail on everything else.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofilters.texi: document more aresample options
Michael Niedermayer [Tue, 11 Dec 2012 11:48:46 +0000 (12:48 +0100)]
filters.texi: document more aresample options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosvq3: fix cast type to be independant of "sizeof(int)"
Michael Niedermayer [Tue, 11 Dec 2012 09:22:01 +0000 (10:22 +0100)]
svq3: fix cast type to be independant of "sizeof(int)"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: fix dca encoder dependencies
Paul B Mahol [Tue, 11 Dec 2012 11:45:22 +0000 (11:45 +0000)]
build: fix dca encoder dependencies

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofate: add BRSTM demuxer test
Paul B Mahol [Mon, 10 Dec 2012 12:59:49 +0000 (12:59 +0000)]
fate: add BRSTM demuxer test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoiff decoder: support RGB8 and RGBN
Peter Ross [Thu, 29 Nov 2012 23:44:36 +0000 (10:44 +1100)]
iff decoder: support RGB8 and RGBN

6 years agoiff demuxer: support RGB8 and RGBN
Peter Ross [Thu, 29 Nov 2012 23:42:15 +0000 (10:42 +1100)]
iff demuxer: support RGB8 and RGBN

6 years agolavf: remove unneeded pb check
Michael Niedermayer [Tue, 11 Dec 2012 08:34:47 +0000 (09:34 +0100)]
lavf: remove unneeded pb check

Fixes CID747727
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoastenc: fix assignment vs compare
Michael Niedermayer [Tue, 11 Dec 2012 07:56:42 +0000 (08:56 +0100)]
astenc: fix assignment vs compare

Fixes CID747736
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: fix memleak
Michael Niedermayer [Tue, 11 Dec 2012 07:51:34 +0000 (08:51 +0100)]
lavf: fix memleak

Fixes CID747738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Dec 2012 07:24:45 +0000 (08:24 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: fix 'clean' target
  ZeroCodec: Flip output

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: remove mp=denoise3d filter.
Clément Bœsch [Mon, 3 Dec 2012 21:20:52 +0000 (22:20 +0100)]
lavfi: remove mp=denoise3d filter.

hqdn3d was meant to be a more efficient denoise3d filter, is supported
natively, and is faster on my computer thanks to the ASM optimisations.

6 years agodoc: fix a -map syntax in one command line example.
Clément Bœsch [Tue, 11 Dec 2012 02:57:33 +0000 (03:57 +0100)]
doc: fix a -map syntax in one command line example.

6 years agobuild: fix prores decoder dependencies.
Clément Bœsch [Tue, 11 Dec 2012 01:52:55 +0000 (02:52 +0100)]
build: fix prores decoder dependencies.

According to lavc/proresdsp.c, both prores and prores-lgpl decoders need
lavc/x86/proresdsp_init.c:ff_proresdsp_x86_init().

6 years agodoxy: add ref for lavfi, lpp and lsws.
Clément Bœsch [Tue, 11 Dec 2012 01:13:43 +0000 (02:13 +0100)]
doxy: add ref for lavfi, lpp and lsws.

6 years agodoxy: fix swr group name
Michael Niedermayer [Tue, 11 Dec 2012 00:53:01 +0000 (01:53 +0100)]
doxy: fix swr group name

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoPrint bpc (for bits per component) with pixel format if it is smaller than expected.
Carl Eugen Hoyos [Tue, 11 Dec 2012 00:26:32 +0000 (01:26 +0100)]
Print bpc (for bits per component) with pixel format if it is smaller than expected.

6 years agolavf/segment: add reset_timestamps option
Stefano Sabatini [Thu, 29 Nov 2012 12:45:50 +0000 (13:45 +0100)]
lavf/segment: add reset_timestamps option

The new options reset the timestamps at each new segment, so that the
generated segments will have timestamps starting close to 0.

It is meant to address trac ticket #1425.

6 years agoopt: fix memleak on error of range_array
Michael Niedermayer [Mon, 10 Dec 2012 23:00:54 +0000 (00:00 +0100)]
opt: fix memleak on error of range_array

Fixes CID747739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: dont null check p, its unneeded
Michael Niedermayer [Mon, 10 Dec 2012 22:58:26 +0000 (23:58 +0100)]
http: dont null check p, its unneeded

Fixes CID747740
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_tinterlace: default of mode switch is impossible, add assert.
Michael Niedermayer [Mon, 10 Dec 2012 22:55:21 +0000 (23:55 +0100)]
vf_tinterlace: default of mode switch is impossible, add assert.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/x86/mpegvideo: switch to av_assert2
Michael Niedermayer [Mon, 10 Dec 2012 21:48:29 +0000 (22:48 +0100)]
libavcodec/x86/mpegvideo: switch to av_assert2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoitu H.263: Fix handling of PB blocks
Michael Niedermayer [Mon, 10 Dec 2012 22:20:47 +0000 (23:20 +0100)]
itu H.263: Fix handling of PB blocks

This fixes artifacts in Ticket744

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: dont try to allocate scratchpad if linesize is not known
Michael Niedermayer [Mon, 10 Dec 2012 19:51:32 +0000 (20:51 +0100)]
h264: dont try to allocate scratchpad if linesize is not known

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: fix 'clean' target
Mans Rullgard [Mon, 10 Dec 2012 14:55:28 +0000 (14:55 +0000)]
build: fix 'clean' target

This fixes removal of TOOLS as well as HOSTPROGS declared in the
top-level Makefile.  The clean target in common.mak needs to be
eval'd since the variables used within are reset for each library.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoswfdec: check lens validity
Michael Niedermayer [Mon, 10 Dec 2012 16:20:32 +0000 (17:20 +0100)]
swfdec: check lens validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoZeroCodec: Flip output
Carl Eugen Hoyos [Sun, 9 Dec 2012 09:24:16 +0000 (10:24 +0100)]
ZeroCodec: Flip output

The initial testing of the VFW binary codec was flawed,
likely due to an AviSynth bug.

Re-testing using VirtualDub and various professional editing
applications has revealed it should have been flipped.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agobuild: update mxf muxer dependencies
Paul B Mahol [Mon, 10 Dec 2012 13:59:15 +0000 (13:59 +0000)]
build: update mxf muxer dependencies

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavc: fix typo and avrn build dependencies
Paul B Mahol [Mon, 10 Dec 2012 13:48:06 +0000 (13:48 +0000)]
lavc: fix typo and avrn build dependencies

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodsputil_mmx: switch to av_assert2()
Michael Niedermayer [Mon, 10 Dec 2012 13:32:23 +0000 (14:32 +0100)]
dsputil_mmx: switch to av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotakdec: silence/fix warning for undefined behavior
Paul B Mahol [Mon, 10 Dec 2012 12:04:02 +0000 (12:04 +0000)]
takdec: silence/fix warning for undefined behavior

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomips: disable ac3 downmix, until its updated to the new data layout.
Michael Niedermayer [Mon, 10 Dec 2012 11:45:11 +0000 (12:45 +0100)]
mips: disable ac3 downmix, until its updated to the new data layout.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Dec 2012 11:12:42 +0000 (12:12 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Remove an outdated todo comment
  rtpdec: Rename a static variable to normal naming conventions
  sh4: dsputil: remove duplicate of ff_gmc_c()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: parse @PRM and @PRQ metadata tags
Peter Ross [Sat, 8 Dec 2012 06:34:11 +0000 (17:34 +1100)]
mov: parse @PRM and @PRQ metadata tags

These tags describe the product and quicktime library version respectively.
Originate from Adobe Premier, but some other products use them.

6 years agocodec_desc: AV_CODEC_ID_SMPTE_KLV is data
Peter Ross [Mon, 10 Dec 2012 10:02:51 +0000 (21:02 +1100)]
codec_desc: AV_CODEC_ID_SMPTE_KLV is data

6 years agortpdec: Remove an outdated todo comment
Martin Storsjö [Sun, 9 Dec 2012 19:00:12 +0000 (21:00 +0200)]
rtpdec: Remove an outdated todo comment

This comment was added in e309128f, in 2002, and has been brought
along since then more or less unmodified.

The first point of the todo was implemented in dbf30963 in 2006,
the second one is not relevant to rtpdec.c (brought along from
rtp.c in 8eb793c4 in 2008) but would be more relevant to the
rtp muxer, although it isn't a good idea anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Rename a static variable to normal naming conventions
Martin Storsjö [Sun, 9 Dec 2012 18:45:27 +0000 (20:45 +0200)]
rtpdec: Rename a static variable to normal naming conventions

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosh4: dsputil: remove duplicate of ff_gmc_c()
Mans Rullgard [Sun, 9 Dec 2012 20:39:42 +0000 (20:39 +0000)]
sh4: dsputil: remove duplicate of ff_gmc_c()

This function is an exact duplicate of the generic one.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoac3dec: fix bugs in direct buffer use.
Michael Niedermayer [Mon, 10 Dec 2012 02:11:16 +0000 (03:11 +0100)]
ac3dec: fix bugs in direct buffer use.

This fixes potentially exploitable out of array writes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Dec 2012 01:13:26 +0000 (02:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: remove unused macro WRAPPER8_16
  configure: fix automatic processing of _extralibs in check_deps
  libvpxenc: Support forcing keyframes
  ac3dec: decode directly into output buffers

Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '30b39164256999efc8d77edc85e2e0b963c24834'
Michael Niedermayer [Mon, 10 Dec 2012 01:06:50 +0000 (02:06 +0100)]
Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'

* commit '30b39164256999efc8d77edc85e2e0b963c24834':
  ac3dec: make downmix() take array of pointers to channel data

Conflicts:
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'
Michael Niedermayer [Mon, 10 Dec 2012 00:32:37 +0000 (01:32 +0100)]
Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
libavcodec/svq3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5d471b73d20616f5ac701ff62e5de49465cda264'
Michael Niedermayer [Mon, 10 Dec 2012 00:27:10 +0000 (01:27 +0100)]
Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'

* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix automatic processing of _extralibs in check_deps
Mans Rullgard [Sun, 9 Dec 2012 17:34:14 +0000 (17:34 +0000)]
configure: fix automatic processing of _extralibs in check_deps

This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agohttp/utils: rename "demuxer" to mime_type
Michael Niedermayer [Mon, 10 Dec 2012 00:00:16 +0000 (01:00 +0100)]
http/utils: rename "demuxer" to mime_type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: set oformat
Michael Niedermayer [Sun, 9 Dec 2012 22:34:32 +0000 (23:34 +0100)]
ffserver: set oformat

Fix Ticket1986

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: remove unused macro WRAPPER8_16
Mans Rullgard [Sun, 9 Dec 2012 13:28:44 +0000 (13:28 +0000)]
dsputil: remove unused macro WRAPPER8_16

This macro has never been used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agotak: reduce difference with qatar
Paul B Mahol [Sat, 8 Dec 2012 12:18:23 +0000 (12:18 +0000)]
tak: reduce difference with qatar

Mostly cosmetics changes, but also makes
decoding little faster here.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoconfigure: fix automatic processing of _extralibs in check_deps
Mans Rullgard [Sun, 9 Dec 2012 17:34:14 +0000 (17:34 +0000)]
configure: fix automatic processing of _extralibs in check_deps

This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavc/avcodec: extend/clarify/fix documentation for avcodec_fill_audio_frame()
Stefano Sabatini [Sat, 8 Dec 2012 21:47:52 +0000 (22:47 +0100)]
lavc/avcodec: extend/clarify/fix documentation for avcodec_fill_audio_frame()

6 years agolavf/segment: remove silly assert(), improve feedback
Stefano Sabatini [Sun, 9 Dec 2012 19:39:27 +0000 (20:39 +0100)]
lavf/segment: remove silly assert(), improve feedback

The code should not assert in case of invalid user input. Fails
gracefully instead.

6 years agohttp/utils: move mime -> demuxer maping from http to utils
Michael Niedermayer [Sun, 9 Dec 2012 19:24:49 +0000 (20:24 +0100)]
http/utils: move mime -> demuxer maping from http to utils

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12: move current_picture_ptr reset to the end of decode_frame.
Michael Niedermayer [Sun, 9 Dec 2012 18:49:51 +0000 (19:49 +0100)]
mpeg12: move current_picture_ptr reset to the end of decode_frame.

This fixes passing fields instead of frames into the decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvpxenc: Support forcing keyframes
Martin Storsjö [Wed, 5 Dec 2012 15:17:20 +0000 (17:17 +0200)]
libvpxenc: Support forcing keyframes

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoprobe: belive protocol content type if set and avoid lengthly probing.
Michael Niedermayer [Sun, 9 Dec 2012 17:42:07 +0000 (18:42 +0100)]
probe: belive protocol content type if set and avoid lengthly probing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: export ICY content type
Michael Niedermayer [Sun, 9 Dec 2012 17:41:23 +0000 (18:41 +0100)]
http: export ICY content type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: TED Talks JSON captions demuxer.
Nicolas George [Tue, 5 Jun 2012 14:34:01 +0000 (16:34 +0200)]
lavf: TED Talks JSON captions demuxer.

6 years agoImprove x264opts description.
Carl Eugen Hoyos [Sun, 9 Dec 2012 17:24:56 +0000 (18:24 +0100)]
Improve x264opts description.

6 years agompegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata
Peter Ross [Sun, 9 Dec 2012 11:42:54 +0000 (22:42 +1100)]
mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: put prefetch under matching #ifdef as the actual code
Michael Niedermayer [Sun, 9 Dec 2012 16:14:15 +0000 (17:14 +0100)]
arm: put prefetch under matching #ifdef as the actual code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoac3dec: make downmix() take array of pointers to channel data
Mans Rullgard [Thu, 13 Sep 2012 18:35:18 +0000 (19:35 +0100)]
ac3dec: make downmix() take array of pointers to channel data

6 years agoac3dec: output planar float only
Mans Rullgard [Tue, 11 Sep 2012 16:25:05 +0000 (17:25 +0100)]
ac3dec: output planar float only

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoac3dec: decode directly into output buffers
Mans Rullgard [Thu, 13 Sep 2012 18:40:03 +0000 (19:40 +0100)]
ac3dec: decode directly into output buffers

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agosvq3: make slice type value unsigned to match svq3_get_ue_golomb return type
Janne Grunau [Sat, 8 Dec 2012 12:36:28 +0000 (13:36 +0100)]
svq3: make slice type value unsigned to match svq3_get_ue_golomb return type

6 years agoconfigure: Have protocols select network code instead of depending on it
Diego Biurrun [Fri, 7 Dec 2012 14:03:40 +0000 (15:03 +0100)]
configure: Have protocols select network code instead of depending on it

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Dec 2012 13:08:01 +0000 (14:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avio: K&R cosmetic formatting

Conflicts:
libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'
Michael Niedermayer [Sun, 9 Dec 2012 12:56:46 +0000 (13:56 +0100)]
Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'

* commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a':
  lavf: fix arithmetic overflows in avformat_seek_file()
  mjpeg: initialize input padding after unescaped buffer to zero

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec: K&R formatting and spelling cosmetics
Martin Storsjö [Fri, 7 Dec 2012 13:50:17 +0000 (15:50 +0200)]
rtpdec: K&R formatting and spelling cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agocosmetics: Fix dropable --> droppable typo
Diego Biurrun [Fri, 7 Dec 2012 09:25:27 +0000 (10:25 +0100)]
cosmetics: Fix dropable --> droppable typo