OSDN Git Service
anatoly [Sun, 27 Mar 2011 20:16:24 +0000 (22:16 +0200)]
Move MJPEG's input buffer preprocessing in separate public function
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
anatoly [Sun, 27 Mar 2011 20:16:23 +0000 (22:16 +0200)]
Support reference picture defined by bitmask in MJPEG's SOS decoder
With cleanup & simplification by me
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Alexander E. Patrakov [Tue, 26 Apr 2011 19:07:55 +0000 (21:07 +0200)]
DCA/DTA encoder
Michael Niedermayer [Tue, 26 Apr 2011 16:18:02 +0000 (18:18 +0200)]
vsrc_buffer: Reinit scale filter when an existing filter is used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 16:17:20 +0000 (18:17 +0200)]
vsrc_buffer: set output timebase when output equalization is done
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 16:16:48 +0000 (18:16 +0200)]
vsrc_buffer: Set output size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Apr 2011 16:15:52 +0000 (18:15 +0200)]
vsrc_buffer: fix NULL dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 25 Apr 2011 18:26:15 +0000 (20:26 +0200)]
bfi: store palette data in the context
Store palette data in the codec context, do not assume that the frame
allocated the first time by avctx->get_buffer will be returned again.
This requires to store the palette which comes with the first frame in
the context, and copy it to the following frames.
Fix trac issue #84.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Michael Niedermayer [Tue, 26 Apr 2011 02:12:43 +0000 (04:12 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
graphparser: add a NULL check on the argument passed to strstr
setdar: prefer "sar" over "par" in log info message
fade: fix draw_slice() check on fade->factor value
fade: make draw_slice() chroma check against planes 1 and 2
win32: include the correct header in cmdutils.c
ac3: fix memleak in fixed-point encoder
flashsv: Return more meaningful error values.
flashsv: Employ explicit AVCodec struct initializers.
read AVI palette from the end of extradata
cosmetics: K&R coding style and more whitespace for Flash Screen Video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Apr 2011 23:45:17 +0000 (01:45 +0200)]
Fix issue1503, this fix may be incomplete we need more samples to know for sure.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 25 Apr 2011 14:16:44 +0000 (16:16 +0200)]
wmadec: prevent null pointer call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 25 Apr 2011 20:08:15 +0000 (22:08 +0200)]
fraps: do not set avctx->pix_fmt to none in decode_init()
This is required for setting up the filterchain, as it requires the
pixel format to be set, which is usually done when probing the file
with av_find_stream_info().
Fix trac issue #83.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Wed, 30 Mar 2011 19:30:31 +0000 (21:30 +0200)]
graphparser: add a NULL check on the argument passed to strstr
Fix crash in create_filter() which occurrs if a scale filter with no
args is provided.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Sat, 26 Mar 2011 14:49:07 +0000 (15:49 +0100)]
setdar: prefer "sar" over "par" in log info message
This is more consistent with the terminology adopted by the aspect
filter names.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mark Himsley [Fri, 18 Mar 2011 15:25:26 +0000 (15:25 +0000)]
fade: fix draw_slice() check on fade->factor value
draw_slice() checks that the fade factor is < 65536 and only
calculates the fade if so. But the fade factor is clipped in
end_frame() by av_clip_uint16() to 65535, so the fade is calculated
for every frame. This patch alters the check so that it compares with
< 65535 (UINT16_MAX).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Mark Himsley [Fri, 18 Mar 2011 14:42:29 +0000 (14:42 +0000)]
fade: make draw_slice() chroma check against planes 1 and 2
draw_slice() checks that planes 0 and 1 of AVFilterBufferRef's data
are not NULL before manipulating planes 1 and 2. This patch makes the
check against planes 1 and 2. More senseful and possibly more robust.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Sun, 24 Apr 2011 23:17:08 +0000 (01:17 +0200)]
lsws: prevent overflow in sws_init_context()
In the loop:
for (i=0; i<dstH; i++) {
int chrI= i*c->chrDstH / dstH;
when i*c->chrDstH > INT_MAX this leads to an integer overflow, which
results in a negative value for chrI and in out-of-buffer reads. The
overflow is avoided by forcing int64_t arithmetic by casting i to
int64_t.
Fix crash, and trac issue #72.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sun, 24 Apr 2011 22:49:18 +0000 (00:49 +0200)]
ffplay: fix logic for selecting the show mode in case of missing video
Also automatically select the show mode only if not specified by the
user.
Fix trac issue #109.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Sun, 24 Apr 2011 22:31:59 +0000 (00:31 +0200)]
ffplay: name ShowMode enum
Help debugging with GDB, maybe cleaner/safer.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Luca Barbato [Mon, 25 Apr 2011 13:30:42 +0000 (15:30 +0200)]
win32: include the correct header in cmdutils.c
CommandLineToArgvW requires windows.h, include it directly
Janne Grunau [Mon, 25 Apr 2011 16:56:40 +0000 (18:56 +0200)]
ac3: fix memleak in fixed-point encoder
caused by typo in mdct_end
Manfred Tremmel [Mon, 25 Apr 2011 17:53:47 +0000 (19:53 +0200)]
Patch from Packman (OpenSuse - packages) to silence rpmlint.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Sun, 24 Apr 2011 22:47:40 +0000 (00:47 +0200)]
Set start_time to 0 for raw audio files.
None of the raw audio files have timestamps, thus setting
start_time to 0 should be reasonable.
Reimar Döffinger [Mon, 25 Apr 2011 10:29:04 +0000 (12:29 +0200)]
Remove now unused audio_float configure option.
Reimar Döffinger [Mon, 25 Apr 2011 10:27:12 +0000 (12:27 +0200)]
dca: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:22:26 +0000 (12:22 +0200)]
vorbisdec: allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 10:16:40 +0000 (12:16 +0200)]
aacdec: Allow selecting float output at runtime.
Reimar Döffinger [Mon, 25 Apr 2011 09:59:28 +0000 (11:59 +0200)]
ac3dec: allow selecting float output at runtime.
Diego Biurrun [Mon, 25 Apr 2011 14:01:58 +0000 (16:01 +0200)]
flashsv: Return more meaningful error values.
Diego Biurrun [Mon, 25 Apr 2011 00:22:46 +0000 (02:22 +0200)]
flashsv: Employ explicit AVCodec struct initializers.
Reimar Döffinger [Mon, 25 Apr 2011 11:54:26 +0000 (13:54 +0200)]
Do not set non_interleaved for DV-in-AVI.
It does not make sense (DV is interleaved by design) and
it avoids a crash when the non-interleaved code tries to
use the priv_data of streams created by the DV demuxer.
The crash could be avoided differently, but then that stream
would still lack an index and would not play correctly in
non-interleaved mode.
Fixes e.g. samples/ffmpeg-bugs/roundup/issue1514/Dennis0002_video1.avi
Carl Eugen Hoyos [Mon, 25 Apr 2011 09:23:06 +0000 (11:23 +0200)]
Warn if the source has unsupported (or no) channel layout.
Kostya Shishkov [Sat, 23 Apr 2011 07:42:19 +0000 (09:42 +0200)]
read AVI palette from the end of extradata
Official AVI specification says that stream header in case of video contains
BITMAPINFO, which is equal to BITMAPINFOHEADER and optional palette. Currently
lavf AVI demuxer thinks otherwise which produces garbage on codecs that have
both palette and extradata (luckily, there are not so many such codecs).
An example of such file is:
http://samples.multimedia.cx/V-codecs/KMVC/baseball1.avi
(IIRC, MSS1 or MSS2 also had such situation but they are still not supported
by lavc).
As a side note, passing palette in extradata as it's been done previously is
not quite correct since proper _extra_ data is surplus bytes in
BITMAPINFOHEADER, not including palette.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Peter Ross [Mon, 25 Apr 2011 01:52:15 +0000 (11:52 +1000)]
Set channel layout for 4 and 5.1 channel cdata audio files
Patch from Carl Eugen Hoyos (cehoyos at ag dot or dot at)
Signed-off-by: Peter Ross <pross@xvid.org>
Michael Niedermayer [Mon, 25 Apr 2011 00:29:09 +0000 (02:29 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
applehttp: Don't export variant_bitrate if it isn't known
crypto: Use av_freep instead of av_free
configure: Add missing libm library dependencies to .pc files.
oggdec: reindent after
8f3eebd6
configure: Add missing libavutil inter-library dependencies to .pc files.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
unknown author [Sun, 24 Apr 2011 23:48:46 +0000 (01:48 +0200)]
Check mmap() return against correct value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 24 Apr 2011 12:47:54 +0000 (14:47 +0200)]
cosmetics: K&R coding style and more whitespace for Flash Screen Video
Diego Biurrun [Sun, 24 Apr 2011 17:49:39 +0000 (19:49 +0200)]
vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 4 has type ‘uint_fast32_t’
libavcodec/vorbisdec.c:543: warning: format ‘%d’ expects type ‘int’, but argument 5 has type ‘uint_fast32_t’
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:43:13 +0000 (00:43 +0200)]
Support fourcc MMJP.
Fixes ticket #107.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:35:59 +0000 (00:35 +0200)]
Support fourcc XVIX.
Fixes ticket #106.
Carl Eugen Hoyos [Sun, 24 Apr 2011 22:27:03 +0000 (00:27 +0200)]
Support fourcc M263.
Fixes ticket #103.
ami_stuff [Sun, 24 Apr 2011 22:20:27 +0000 (00:20 +0200)]
Support fourcc auv2.
Fixes ticket #101.
Reimar Döffinger [Sun, 24 Apr 2011 22:02:36 +0000 (00:02 +0200)]
Fix indentation.
Reimar Döffinger [Sun, 24 Apr 2011 17:17:17 +0000 (19:17 +0200)]
Support PARSER_FLAG_COMPLETE_FRAMES for h261 and h263 parsers.
Stefano Sabatini [Fri, 22 Apr 2011 15:11:23 +0000 (17:11 +0200)]
ffplay: avoid SIGFPE exception in SDL_DisplayYUVOverlay
In video_image_display(), fix exception occurring when the size of the
rectangle passed to SDL_DisplayYUVOverlay() is 0x0, which happens when
interactively resizing the SDL window.
This is done by forcing the minimum size to 1x1.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Michael Niedermayer [Sun, 24 Apr 2011 20:38:05 +0000 (22:38 +0200)]
avi: try to synchronize the points in time of the starts of streams after seeking.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 24 Apr 2011 19:29:35 +0000 (21:29 +0200)]
Add flag to force demuxers to sort more strictly by dts.
This enables non interleaved AVI mode for example.
Players that are picky on strict interleaving can set this.
Patches to only switch to non intereaved AVI mode when the index is not strictly
correctly interleaved are welcome.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 24 Apr 2011 17:19:49 +0000 (20:19 +0300)]
applehttp: Don't export variant_bitrate if it isn't known
If there are no variants, the total bitrate of the single
stream isn't known, and exporting variant_bitrate = 0 does
look weird, since there really aren't any variants.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 24 Apr 2011 17:10:37 +0000 (20:10 +0300)]
crypto: Use av_freep instead of av_free
Using av_freep is generally good practice.
Signed-off-by: Martin Storsjö <martin@martin.st>
Philip Langdale [Thu, 21 Apr 2011 04:41:43 +0000 (21:41 -0700)]
CrystalHD: Add AVOption to configure hardware downscaling.
The CrystalHD hardware can do scaling, which is particularly
desirable when dealing with some high resolution clips that take
so long to decode and copy out that they end up playing back
slower than realtime. By using scaling, we can make the output
frames smaller and reduce the copy out time.
This option takes the desired horizontal width in pixels, and
the hardware will do an aspect-scale. Upscaling is not supported
and the hardware will simply ignore any request to do so.
Signed-off-by: Philip Langdale <philipl@overt.org>
Reimar Döffinger [Sun, 24 Apr 2011 12:49:29 +0000 (14:49 +0200)]
Check for malloc failures in fraps decoder.
Reimar Döffinger [Sun, 24 Apr 2011 12:39:07 +0000 (14:39 +0200)]
Use av_fast_malloc instead of av_realloc in fraps decoder.
Nicolas George [Sat, 23 Apr 2011 09:42:26 +0000 (11:42 +0200)]
general.texi: document libcelt decoder.
Michael Niedermayer [Sun, 24 Apr 2011 15:46:50 +0000 (17:46 +0200)]
Fix some passing argument from incompatible pointer type warnings.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reinhard Tartler [Sun, 24 Apr 2011 15:24:24 +0000 (17:24 +0200)]
configure: Add missing libm library dependencies to .pc files.
This unbreaks static compilation using pkg-config on systems in need of -lm.
Based on an mplayer2 patch by Uoti Urpala <uau@mplayer2.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Clément Bœsch [Sun, 24 Apr 2011 13:40:57 +0000 (15:40 +0200)]
oggdec: reindent after
8f3eebd6
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Reinhard Tartler [Sun, 24 Apr 2011 09:39:15 +0000 (11:39 +0200)]
configure: Add missing libavutil inter-library dependencies to .pc files.
This unbreaks static compilation when using pkg-config.
Based on an mplayer2 patch by Uoti Urpala <uau@mplayer2.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Sun, 24 Apr 2011 11:27:07 +0000 (13:27 +0200)]
Drop section describung now unneeded workarounds for BSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 24 Apr 2011 11:23:51 +0000 (13:23 +0200)]
Fix building on FreeBSD8.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Sebastian Vater [Wed, 20 Apr 2011 11:56:56 +0000 (13:56 +0200)]
HAM6/HAM8 support for IFF demuxer/decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 23 Apr 2011 12:09:19 +0000 (22:09 +1000)]
EA cdata demuxer: support files with 20 byte header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 23 Apr 2011 12:09:10 +0000 (22:09 +1000)]
EA cdata demuxer: support 6 channel files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 23 Apr 2011 23:41:51 +0000 (09:41 +1000)]
EA cdata demuxer: set codec->sample_fmt
This is required by has_codec_parameters in libavformat/utils.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 23 Apr 2011 12:08:48 +0000 (22:08 +1000)]
permit decoding of multichannel ADPCM_EA_XAS
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 24 Apr 2011 01:38:03 +0000 (03:38 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
Handle unicode file names on windows
rtp: Rename the open/close functions to alloc/free
Lowercase all ff* program names.
Refer to ff* tools by their lowercase names.
NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg.
Replace `` by $() syntax in shell scripts.
patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled Remove stray libavcore and _g binary references.
vorbis: Rename decoder/encoder files to follow general file naming scheme.
aacenc: Fix whitespace after last commit.
cook: Fix small typo in av_log_ask_for_sample message.
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
Remove RDFT dependency from AAC decoder.
Add some debug log messages to AAC extradata
Fix mov debug (u)int64_t format strings.
bswap: use native types for av_bwap16().
doc: FLV muxing is supported.
applehttp: Handle AES-128 encrypted streams
Add a protocol handler for AES CBC decryption with PKCS7 padding
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set
Conflicts:
ffplay.c
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kirill Gavrilov [Wed, 20 Apr 2011 11:36:44 +0000 (14:36 +0300)]
Handle unicode file names on windows
All file names should be in UTF-8 within libavformat.
This is handled by mapping the open() function to an internal one
in os_support.h for windows.
fopen() could be overridden in the same way, but if that would be
used from ffmpeg.c, it would add a dependency on an ff prefixed
internal lavf function.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 20 Apr 2011 12:36:37 +0000 (15:36 +0300)]
rtp: Rename the open/close functions to alloc/free
This avoids clashes if we internally want to override the global
open function.
Signed-off-by: Martin Storsjö <martin@martin.st>
Baptiste Coudurier [Sat, 23 Apr 2011 19:41:11 +0000 (12:41 -0700)]
In libx264 wrapper, fix side effect with has_b_frames, bframe_pyramid can be set
when bframe is not.
Diego Biurrun [Sat, 23 Apr 2011 13:19:17 +0000 (15:19 +0200)]
Lowercase all ff* program names.
Diego Biurrun [Sat, 23 Apr 2011 14:40:01 +0000 (16:40 +0200)]
Refer to ff* tools by their lowercase names.
Diego Biurrun [Sat, 23 Apr 2011 14:39:03 +0000 (16:39 +0200)]
Replace more FFmpeg instances by Libav or ffmpeg.
Diego Biurrun [Mon, 18 Apr 2011 22:16:24 +0000 (00:16 +0200)]
Replace `` by $() syntax in shell scripts.
$() is easier to nest and POSIX, which we require in other places.
Brad [Mon, 28 Mar 2011 01:05:22 +0000 (21:05 -0400)]
patcheck: Allow overiding grep program(s) through environment variables.
patcheck hardcodes the binary names for grep/egrep. This makes overriding the
binary names a pain, e.g. when calling a GNU version of grep on BSD systems.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Sat, 23 Apr 2011 12:14:22 +0000 (14:14 +0200)]
Remove stray libavcore and _g binary references.
Diego Biurrun [Sun, 17 Apr 2011 17:44:33 +0000 (19:44 +0200)]
vorbis: Rename decoder/encoder files to follow general file naming scheme.
Nathan Caldwell [Tue, 5 Apr 2011 07:05:24 +0000 (01:05 -0600)]
aacenc: Fix whitespace after last commit.
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Sat, 23 Apr 2011 11:37:28 +0000 (13:37 +0200)]
Set channel layout in flac decoder.
Stefano Sabatini [Fri, 22 Apr 2011 09:09:48 +0000 (11:09 +0200)]
ffplay: factorize code calling output_packet() in video_thread()
Slightly simplify.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Fri, 22 Apr 2011 09:26:44 +0000 (11:26 +0200)]
ffplay: remove reference to unused QETimer symbol
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Fri, 22 Apr 2011 00:19:48 +0000 (02:19 +0200)]
ffplay: rename stream_pause() to stream_toggle_pause()
The new name is less misleading, since the function will resume the
stream if it is currently paused.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Fri, 22 Apr 2011 22:08:28 +0000 (00:08 +0200)]
flicvideo: fix crash on flic files with invalid frame size
Add a check in flic_decode_frame_8BPP(), in case chunk_size is >
frame_size issue a warning and resize chunk_size to frame_size, in
order to avoid out-of-buffer reads.
Fix roundup issue #2520, trac issue #69.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Stefano Sabatini [Fri, 22 Apr 2011 22:07:15 +0000 (00:07 +0200)]
flicvideo: increase error level and fix error message in CHECK_PIXEL_PTR()
Also return AVERROR_INVALIDDATA rather than -1.
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Diego Biurrun [Sat, 23 Apr 2011 00:02:42 +0000 (02:02 +0200)]
cook: Fix small typo in av_log_ask_for_sample message.
Nathan Caldwell [Wed, 5 Jan 2011 08:32:16 +0000 (01:32 -0700)]
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
There is still are still a few sections missing relating to TNS (not present)
and mid/side (contains other bugs).
Overall this improves quality, and vastly improves rate-control.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 23 Apr 2011 08:44:21 +0000 (10:44 +0200)]
aac: add math.h needed for log2f()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:41:44 +0000 (10:41 +0200)]
10l: Add misssing CR/LF.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:31:03 +0000 (10:31 +0200)]
Support channel layout when demuxing aif files.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:30:18 +0000 (10:30 +0200)]
Support channel layout when demuxing caf files.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:19:21 +0000 (10:19 +0200)]
Extend unknown CAF chunk warning message: Print size.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:09:11 +0000 (10:09 +0200)]
Fix compilation with libcelt on Apple OS X.
Fixes ticket #97.
Carl Eugen Hoyos [Sat, 23 Apr 2011 08:06:39 +0000 (10:06 +0200)]
Fix compilation after version bump.
Alex Converse [Thu, 21 Apr 2011 18:39:04 +0000 (18:39 +0000)]
Remove RDFT dependency from AAC decoder.
$subj
>From
557176d961c70604c2a96d81aff4bd6faa670d8a Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Thu, 21 Apr 2011 12:11:42 -0700
Subject: [PATCH] Remove RDFT dependency from AAC decoder.
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1"
This is a multi-part message in MIME format.
--------------1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
It was used for an old implementation of the SBR filterbank.
./configure --disable-everything --disable-ffplay --enable-decoder=aac works.
Alex Converse [Wed, 20 Apr 2011 17:47:28 +0000 (17:47 +0000)]
Add some debug log messages to AAC extradata
On Wed, Apr 20, 2011 at 11:39 AM, Justin Ruggles
<justin.ruggles@gmail.com> wrote:
> On 04/20/2011 02:26 PM, Alex Converse wrote:
>
>> ---
>> libavcodec/aacdec.c | 10 +++++++++-
>> 1 files changed, 9 insertions(+), 1 deletions(-)
>>
>>
>>
>> 0002-Add-some-Debug-log-messages-to-AAC-extradata.patch
>>
>>
>> diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
>> index
c9761a1..
3ec274f 100644
>> --- a/libavcodec/aacdec.c
>> +++ b/libavcodec/aacdec.c
>> @@ -79,7 +79,6 @@
>> Parametric Stereo.
>> */
>>
>> -
>> #include "avcodec.h"
>> #include "internal.h"
>> #include "get_bits.h"
>
>
> stray whitespace change
>
oops, fixed
>From
94e8d0eea77480630f84368c97646cabc0f50628 Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Wed, 20 Apr 2011 11:23:34 -0700
Subject: [PATCH] Add some debug log messages to AAC extradata
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1"
This is a multi-part message in MIME format.
--------------1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
Alex Converse [Wed, 20 Apr 2011 17:25:47 +0000 (17:25 +0000)]
Fix mov debug (u)int64_t format strings.
Jason Garrett-Glaser [Fri, 22 Apr 2011 21:59:55 +0000 (17:59 -0400)]
bswap: use native types for av_bwap16().
This prevents a call to bytestream_get_be16() using a movzwl both before
and after the ror instruction, which is obviously inefficient. Arm uses
the same trick also.
Sintel decoding goes from (avg+SD) 9.856 +/- 0.003 to 9.797 +/- 0.003 sec.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Michael Niedermayer [Fri, 22 Apr 2011 23:09:43 +0000 (01:09 +0200)]
Merge remote branch 'qatar/master'
* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 22 Apr 2011 17:24:17 +0000 (19:24 +0200)]
doc: FLV muxing is supported.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 23 Jan 2011 21:42:18 +0000 (23:42 +0200)]
applehttp: Handle AES-128 encrypted streams
This should hopefully fix roundup issue 2586.
This commit only implements it in the demuxer, not in the
protocol handler. If desired, some of the code could be
refactored to be shared by both implementations.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sat, 22 Jan 2011 23:31:41 +0000 (01:31 +0200)]
Add a protocol handler for AES CBC decryption with PKCS7 padding
This can later be extended to support other AES bit sizes,
encryption, other crypto algorithms, reading the key from a URL, etc.
In order to use it, the key and initialization vector has to be
passed via AVOptions. Since such options can't be passed to
protocols from the command line, the protocol is currently
only for libavformat internal use.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 21 Apr 2011 21:45:06 +0000 (00:45 +0300)]
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set
Setting this should fix the FATE build failure on DragonFly BSD,
since inet_aton only is visible if __BSD_VISIBLE is set.
Alternatively, a line defining __BSD_VISIBLE=1 could be
added at the top of os_support.c. For FreeBSD, similar lines
are required in libavdevice/bktr.c and libavdevice/oss_audio.c, too.
Signed-off-by: Martin Storsjö <martin@martin.st>