]>
git.sesse.net Git - ffmpeg/log
Paul B Mahol [Fri, 2 Nov 2012 23:39:03 +0000 (23:39 +0000)]
indeo3: release buffer before calling decode_plane
Paul B Mahol [Tue, 30 Oct 2012 12:10:40 +0000 (12:10 +0000)]
Revert "Partly revert
f174fba : indeo3 decoder does not support direct rendering."
f174fba did not introduce DR1 flag it was already available before that.
This reverts commit
8bf44d5c9681233f5c1fd353b18276f25b199b7a .
Michael Niedermayer [Fri, 2 Nov 2012 22:47:32 +0000 (23:47 +0100)]
libvo-amrwbenc: allow sampling rates other than 16khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:47:12 +0000 (23:47 +0100)]
libopencore-amr: allow sampling rates other than 8khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:46:47 +0000 (23:46 +0100)]
libopencore-amrdec: allow sampling rates other than 8khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:46:19 +0000 (23:46 +0100)]
amrwbdec: allow sample rates other than 16khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:45:54 +0000 (23:45 +0100)]
amrnbdec: allow sample rates other than 8khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 2 Nov 2012 21:54:44 +0000 (21:54 +0000)]
lclenc: make compression level user selectable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Heesuk Jung [Fri, 2 Nov 2012 15:25:03 +0000 (08:25 -0700)]
Fix bit_rate in MPEG1/2 Video
In ISO/IEC 13818-2, bit rate is differently determined according to video type
1) MPEG1 Video
Bit_rate and vbv_delay are set to 3FFFF and FFFF respectively
to indicate variable bitrate. Other values are for constant bitrate.
VBV is only defined for constant bit rate operation.
Ths STD supersedes the VBV model for vbr.
2) MPEG2 Video
Even if the bitrate is constant, the value of bit_rate may not be the actual bitrate
since bit_rate need only be an upper bound to that actual bitrate.
VBV is only defined for variable bit rate operation.
Constant bit rate is viewed as a special case of vbr.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 2 Nov 2012 19:44:49 +0000 (19:44 +0000)]
apedec: consume packet after it has been fully decoded
Timestamp handling of decoded frames are much simpler now.
Fixes #1675.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Janne Grunau [Mon, 29 Oct 2012 15:26:59 +0000 (16:26 +0100)]
doc: add apidoc target for doxygen API documentation
Documentation includes only the externally visible API of the installed
headers.
Based on a patch by Anton Khirnov <anton@khirnov.net>.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Wed, 31 Oct 2012 15:54:16 +0000 (16:54 +0100)]
lavf: fix av_interleaved_write_frame() doxy.
A sentence was mistakenly inserted in the middle of another sentence.
Anton Khirnov [Thu, 1 Nov 2012 05:34:41 +0000 (06:34 +0100)]
matroskadec: do not use avpacket internals
Anton Khirnov [Wed, 31 Oct 2012 18:59:53 +0000 (19:59 +0100)]
lavf: clarify the lifetime of demuxed packets.
Anton Khirnov [Wed, 31 Oct 2012 20:15:41 +0000 (21:15 +0100)]
avconv: do not free muxed packet on streamcopy.
The packet belongs to lavf, the caller must not free it or access it in
any other way.
No change in practice, since destruct is set to NULL anyway.
Anton Khirnov [Fri, 2 Nov 2012 09:58:36 +0000 (10:58 +0100)]
crc: move doxy to the header
Anton Khirnov [Fri, 2 Nov 2012 09:56:30 +0000 (10:56 +0100)]
vf_drawtext: do not use deprecated av_tree_node_size
Paul B Mahol [Fri, 2 Nov 2012 16:21:17 +0000 (16:21 +0000)]
smjpegdec: set nb_frames for video stream
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Wed, 1 Aug 2012 22:55:34 +0000 (00:55 +0200)]
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Diego Biurrun [Fri, 2 Nov 2012 11:04:16 +0000 (12:04 +0100)]
parser: Move Doxygen documentation to the header files
John Stebbins [Sat, 20 Oct 2012 16:56:11 +0000 (09:56 -0700)]
PGS subtitles: Expose forced flag
Useful for detection of subtitles displayed during foreign language
scenes.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Sun, 15 Jul 2012 15:43:50 +0000 (17:43 +0200)]
x86: PMINUB: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 13:41:30 +0000 (15:41 +0200)]
x86: ac3dsp: port to cpuflags
Diego Biurrun [Tue, 30 Oct 2012 00:11:14 +0000 (01:11 +0100)]
x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
"mmxext" is a more sensible name and more common in outside projects.
Nicolas George [Sun, 28 Oct 2012 13:41:40 +0000 (14:41 +0100)]
lavc/pngdec: decode textual data (tEXt and zTXt).
Requested in trac ticket #1857.
Nicolas George [Sun, 28 Oct 2012 13:40:30 +0000 (14:40 +0100)]
lavu/bprint: add av_bprint_get_buffer().
It is useful to use bprint to handle a growing buffer
used with another API.
Michael Niedermayer [Fri, 2 Nov 2012 13:40:04 +0000 (14:40 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv1394: Swap the min and max values of the 'standard' option
rtpdec_vp8: Don't parse fields that aren't used
lavc: add some AVPacket doxy.
audiointerleave: deobfuscate a function call.
rtpdec: factorize identical code used in several handlers
a64: remove interleaved mode.
doc: Point to the new location of the c99-to-c89 tool
decode_audio3: initialize AVFrame
ws-snd1: set channel layout
wmavoice: set channel layout
wmapro: use AVCodecContext.channels instead of keeping a private copy
wma: do not keep private copies of some AVCodecContext fields
Conflicts:
libavcodec/wmadec.c
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 30 Oct 2012 01:54:25 +0000 (02:54 +0100)]
x86inc: Only define program_name if the macro is unset
This allows overriding the value from outside of the file.
Michael Niedermayer [Fri, 2 Nov 2012 13:15:28 +0000 (14:15 +0100)]
Merge commit '
50a65e7a540ce6747f81d6dbf6a602ad35be77ff '
* commit '
50a65e7a540ce6747f81d6dbf6a602ad35be77ff ': (24 commits)
vmdaudio: set channel layout
twinvq: validate sample rate code
twinvq: set channel layout
twinvq: validate that channels is not <= 0
truespeech: set channel layout
sipr: set channel layout
shorten: validate that the channel count in the header is not <= 0
ra288dec: set channel layout
ra144dec: set channel layout
qdm2: remove unneeded checks for channel count
qdm2: make sure channels is not <= 0 and set channel layout
qcelpdec: set channel layout
nellymoserdec: set channels to 1
libopencore-amr: set channel layout for amr-nb or if not set by the user
libilbc: set channel layout
dpcm: use AVCodecContext.channels instead of keeping a private copy
imc: set channels to 1 instead of validating it
gsmdec: always set channel layout and sample rate at initialization
libgsmdec: always set channel layout and sample rate at initialization
g726dec: do not validate sample rate
...
Conflicts:
libavcodec/dpcm.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 13:00:23 +0000 (14:00 +0100)]
pcm: fix handling of more than 8 channels for planar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 12:39:53 +0000 (13:39 +0100)]
Merge commit '
8ac0f6767bf63d3e6b308ee6648ff02598b81e03 '
* commit '
8ac0f6767bf63d3e6b308ee6648ff02598b81e03 ':
dcadec: allow the decoder to change the channel layout mid-stream
cook: use av_dlog() for debug logging instead of av_log() with AV_LOG_ERROR
cook: move samples_per_frame from COOKSubpacket to where it is used
cook: use av_get_channel_layout_nb_channels() instead of cook_count_channels()
cook: reverse a condition so that the code makes more sense
cook: remove unneeded COOKContext variable, sample_rate
cook: remove unneeded COOKContext variable, bit_rate
cook: use AVCodecContext.channels instead of keeping a private copy
bmvaudio: set channel layout at init() rather than validating it
atrac1: do not keep a copy of channel count in the private context
dsicinaudio: set channels and channel layout
g722dec: set channel layout at initialization instead of validating it
amrwbdec: set channels, channel_layout, and sample_rate
amrnbdec: set channels, channel_layout, and sample_rate
dca_parser: allow the parser to change the sample rate
lavc: check channel count after decoder init
lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders
Conflicts:
libavcodec/dcadec.c
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 01:07:15 +0000 (02:07 +0100)]
dv1394: Swap the min and max values of the 'standard' option
DV1394_NTSC has a lower value than DV1394_PAL.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 8 Oct 2012 22:17:45 +0000 (01:17 +0300)]
rtpdec_vp8: Don't parse fields that aren't used
This avoids warnings about unused variables.
Signed-off-by: Martin Storsjö <martin@martin.st>
Anton Khirnov [Wed, 31 Oct 2012 16:27:24 +0000 (17:27 +0100)]
lavc: add some AVPacket doxy.
Anton Khirnov [Wed, 31 Oct 2012 21:10:41 +0000 (22:10 +0100)]
audiointerleave: deobfuscate a function call.
right above there is if (pkt) {<do stuff>; pkt = NULL}, so pkt is just a
fancy name for NULL at this point.
Anton Khirnov [Thu, 1 Nov 2012 13:03:04 +0000 (14:03 +0100)]
rtpdec: factorize identical code used in several handlers
Anton Khirnov [Wed, 31 Oct 2012 21:32:36 +0000 (22:32 +0100)]
a64: remove interleaved mode.
It has been disabled since it was added two years ago.
Jason [Mon, 22 Oct 2012 03:56:18 +0000 (23:56 -0400)]
Add QT CC track mux support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 01:07:15 +0000 (02:07 +0100)]
dv1394: fix order of AVOption fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexis Ballier [Thu, 1 Nov 2012 14:14:59 +0000 (11:14 -0300)]
Apply again [
916352f282855e3e4e86a39df9452fead2aa0771 ] that got lost in the merges.
Do not quote second argument to filter{,_out} in check_ld. We want to keep/remove all the space-separated words matching the -l* pattern, not keep everything if the whole argument begins with -l and remove it otherwise.
This also fixes errors like:
./configure: eval: line 418: syntax error near unexpected token `-l*'
./configure: eval: line 418: `case in -l*) ;; *) echo ;; esac'
when run with ./configure --enable-openal
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Nov 2012 21:08:55 +0000 (22:08 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: remove redundant !codec check
ffplay: only initialize codec opts before using it
ffplay: always free buffersink_params in configure_video_filters
ffplay: remove uneeded format filter, buffersink format is set
ffplay: check for buffersink_params allocation success
ffplay: always free inputs and outputs in configure_filtergraph
ffplay: fill the unused part of the window with black
ffplay: add update parameter to fill_rectangle
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 1 Nov 2012 13:27:18 +0000 (15:27 +0200)]
doc: Point to the new location of the c99-to-c89 tool
This location contains prebuilt binaries as well.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 1 Nov 2012 20:16:32 +0000 (21:16 +0100)]
lavf: fix integer overflow in rfps calculation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Nov 2012 18:54:47 +0000 (19:54 +0100)]
avienc: force a valid timebase for video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ilkka Ollakka [Wed, 31 Oct 2012 09:24:36 +0000 (11:24 +0200)]
decode_audio3: initialize AVFrame
Same fix and issue as in
a25d912dca9cd553440167e0476c47581359c0fc
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Thu, 1 Nov 2012 17:28:12 +0000 (18:28 +0100)]
doc/platform: Comply With All Capitalized Words Convention
Michael Niedermayer [Thu, 1 Nov 2012 17:02:23 +0000 (18:02 +0100)]
lavfi/fifo: add assert to ensure request was successfull.
We would crash a moment later anyway if this fails.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 1 Nov 2012 16:22:04 +0000 (17:22 +0100)]
mpegts_probe: detect files with garbage at the begin.
Fixes Ticket1811
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Tue, 23 Oct 2012 21:22:53 +0000 (17:22 -0400)]
ws-snd1: set channel layout
Justin Ruggles [Tue, 23 Oct 2012 21:19:25 +0000 (17:19 -0400)]
wmavoice: set channel layout
Justin Ruggles [Tue, 23 Oct 2012 19:27:44 +0000 (15:27 -0400)]
vmdaudio: set channel layout
Justin Ruggles [Tue, 23 Oct 2012 21:10:37 +0000 (17:10 -0400)]
wmapro: use AVCodecContext.channels instead of keeping a private copy
Justin Ruggles [Tue, 23 Oct 2012 17:17:50 +0000 (13:17 -0400)]
twinvq: validate sample rate code
A large invalid value could cause undefined behavior when left-shifted
by 8 later in the function.
Justin Ruggles [Tue, 23 Oct 2012 20:30:59 +0000 (16:30 -0400)]
wma: do not keep private copies of some AVCodecContext fields
channels, sample_rate, bit_rate, and block_align can be used directly from
the AVCodecContext
Justin Ruggles [Tue, 23 Oct 2012 17:17:17 +0000 (13:17 -0400)]
twinvq: set channel layout
Justin Ruggles [Tue, 23 Oct 2012 17:15:24 +0000 (13:15 -0400)]
twinvq: validate that channels is not <= 0
This could occur due to integer overflow when reading the channel count from
the extradata.
Justin Ruggles [Tue, 23 Oct 2012 04:53:16 +0000 (00:53 -0400)]
truespeech: set channel layout
Justin Ruggles [Tue, 23 Oct 2012 04:51:26 +0000 (00:51 -0400)]
sipr: set channel layout
Justin Ruggles [Tue, 23 Oct 2012 04:40:51 +0000 (00:40 -0400)]
shorten: validate that the channel count in the header is not <= 0
Justin Ruggles [Tue, 23 Oct 2012 04:35:50 +0000 (00:35 -0400)]
ra288dec: set channel layout
Justin Ruggles [Mon, 22 Oct 2012 22:57:39 +0000 (18:57 -0400)]
ra144dec: set channel layout
Justin Ruggles [Mon, 22 Oct 2012 22:54:29 +0000 (18:54 -0400)]
qdm2: remove unneeded checks for channel count
Justin Ruggles [Mon, 22 Oct 2012 22:53:19 +0000 (18:53 -0400)]
qdm2: make sure channels is not <= 0 and set channel layout
Justin Ruggles [Mon, 22 Oct 2012 22:25:46 +0000 (18:25 -0400)]
qcelpdec: set channel layout
Justin Ruggles [Mon, 22 Oct 2012 21:58:24 +0000 (17:58 -0400)]
nellymoserdec: set channels to 1
Justin Ruggles [Mon, 22 Oct 2012 21:49:59 +0000 (17:49 -0400)]
libopencore-amr: set channel layout for amr-nb or if not set by the user
Justin Ruggles [Mon, 22 Oct 2012 21:41:47 +0000 (17:41 -0400)]
libilbc: set channel layout
Justin Ruggles [Mon, 22 Oct 2012 20:03:20 +0000 (16:03 -0400)]
dpcm: use AVCodecContext.channels instead of keeping a private copy
Justin Ruggles [Mon, 22 Oct 2012 19:54:29 +0000 (15:54 -0400)]
imc: set channels to 1 instead of validating it
Justin Ruggles [Mon, 22 Oct 2012 19:45:38 +0000 (15:45 -0400)]
gsmdec: always set channel layout and sample rate at initialization
Only mono 8kHz is supported.
Justin Ruggles [Sun, 21 Oct 2012 19:12:36 +0000 (15:12 -0400)]
dcadec: allow the decoder to change the channel layout mid-stream
Justin Ruggles [Mon, 22 Oct 2012 19:43:59 +0000 (15:43 -0400)]
libgsmdec: always set channel layout and sample rate at initialization
Only mono 8kHz is supported.
Justin Ruggles [Mon, 22 Oct 2012 17:26:46 +0000 (13:26 -0400)]
g726dec: do not validate sample rate
For decoding it does not really matter what the sample rate is.
Justin Ruggles [Mon, 22 Oct 2012 17:26:14 +0000 (13:26 -0400)]
g726dec: set channel layout at initialization instead of validating it
Justin Ruggles [Sun, 21 Oct 2012 21:04:58 +0000 (17:04 -0400)]
flacdec: do not warn on sample rate change
Justin Ruggles [Sun, 21 Oct 2012 21:02:28 +0000 (17:02 -0400)]
flacdec: allow mid-stream channel layout change
Although the libFLAC decoder cannot handle such a change, it is allowed by the
spec and could potentially occur with live streams.
Justin Ruggles [Sun, 21 Oct 2012 20:15:34 +0000 (16:15 -0400)]
flacdec: use av_samples_* functions for sample buffer allocation
Also, return an error on allocation failure.
Justin Ruggles [Sun, 21 Oct 2012 18:47:10 +0000 (14:47 -0400)]
cook: use av_dlog() for debug logging instead of av_log() with AV_LOG_ERROR
Justin Ruggles [Sun, 21 Oct 2012 18:43:02 +0000 (14:43 -0400)]
cook: move samples_per_frame from COOKSubpacket to where it is used
Justin Ruggles [Sun, 21 Oct 2012 18:36:38 +0000 (14:36 -0400)]
cook: use av_get_channel_layout_nb_channels() instead of cook_count_channels()
Justin Ruggles [Sun, 21 Oct 2012 18:33:11 +0000 (14:33 -0400)]
cook: reverse a condition so that the code makes more sense
Justin Ruggles [Sun, 21 Oct 2012 18:26:29 +0000 (14:26 -0400)]
cook: remove unneeded COOKContext variable, sample_rate
Justin Ruggles [Sun, 21 Oct 2012 18:25:18 +0000 (14:25 -0400)]
cook: remove unneeded COOKContext variable, bit_rate
Justin Ruggles [Sun, 21 Oct 2012 18:24:04 +0000 (14:24 -0400)]
cook: use AVCodecContext.channels instead of keeping a private copy
Justin Ruggles [Sun, 21 Oct 2012 17:48:50 +0000 (13:48 -0400)]
bmvaudio: set channel layout at init() rather than validating it
Justin Ruggles [Wed, 17 Oct 2012 15:45:49 +0000 (11:45 -0400)]
atrac1: do not keep a copy of channel count in the private context
Justin Ruggles [Wed, 17 Oct 2012 15:29:04 +0000 (11:29 -0400)]
dsicinaudio: set channels and channel layout
Justin Ruggles [Mon, 15 Oct 2012 20:40:44 +0000 (16:40 -0400)]
g722dec: set channel layout at initialization instead of validating it
Justin Ruggles [Mon, 8 Oct 2012 01:19:28 +0000 (21:19 -0400)]
amrwbdec: set channels, channel_layout, and sample_rate
Only mono 16kHz is supported.
Justin Ruggles [Mon, 8 Oct 2012 01:17:45 +0000 (21:17 -0400)]
amrnbdec: set channels, channel_layout, and sample_rate
Only mono 8kHz is supported.
Justin Ruggles [Mon, 8 Oct 2012 00:52:35 +0000 (20:52 -0400)]
dca_parser: allow the parser to change the sample rate
Justin Ruggles [Tue, 23 Oct 2012 04:56:00 +0000 (00:56 -0400)]
lavc: check channel count after decoder init
Ensures the decoder did not set channel count to an insanely high value
during initialization, which could cause large memory usage when it tries to
get a buffer during decoding.
Justin Ruggles [Mon, 22 Oct 2012 17:40:10 +0000 (13:40 -0400)]
lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders
Tomas Härdin [Wed, 24 Oct 2012 14:30:06 +0000 (16:30 +0200)]
mxfdec: Fix inferred misuses of enums
This fixes CID 700457, 700458 and 703705.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Sun, 28 Oct 2012 00:22:47 +0000 (02:22 +0200)]
ffplay: remove redundant !codec check
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 28 Oct 2012 00:19:18 +0000 (02:19 +0200)]
ffplay: only initialize codec opts before using it
Fixes Coverity CID 733793.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 28 Oct 2012 00:00:52 +0000 (02:00 +0200)]
ffplay: always free buffersink_params in configure_video_filters
Fixes Coverity CID 733792.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 27 Oct 2012 23:51:25 +0000 (01:51 +0200)]
ffplay: remove uneeded format filter, buffersink format is set
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 27 Oct 2012 23:31:14 +0000 (01:31 +0200)]
ffplay: check for buffersink_params allocation success
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 27 Oct 2012 23:19:34 +0000 (01:19 +0200)]
ffplay: always free inputs and outputs in configure_filtergraph
Fixes Coverity CID 733791.
Signed-off-by: Marton Balint <cus@passwd.hu>