]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 28 Nov 2012 20:58:45 +0000 (21:58 +0100)]
src_movie: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 20:53:56 +0000 (21:53 +0100)]
vsrc_testsrc: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 20:49:04 +0000 (21:49 +0100)]
vsink_nullsink: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 20:47:39 +0000 (21:47 +0100)]
vf_unsharp: switch to filter_frame, this filter did not support slices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 20:46:23 +0000 (21:46 +0100)]
vf_transpose: switch to filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 20:02:09 +0000 (21:02 +0100)]
vf_select: switch to filter_frame
The new code reads the input frame when its ready, the previous
code did read the input frame during start_frame at which point it
may not yet be available.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 20:10:06 +0000 (21:10 +0100)]
vf_showinfo: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 19:48:42 +0000 (20:48 +0100)]
vf_pad: switch to filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Daniel Verkamp [Wed, 21 Dec 2011 02:20:04 +0000 (02:20 +0000)]
Vivo demuxer
Michael Niedermayer [Wed, 28 Nov 2012 19:18:27 +0000 (20:18 +0100)]
vf_pixdesctest: switch to filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 19:10:51 +0000 (20:10 +0100)]
vf_libopencv: switch to filter_frame, this filter did not support slices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 28 Nov 2012 19:19:09 +0000 (20:19 +0100)]
lavfi/geq: switch to filter_frame.
Anton Khirnov [Wed, 28 Nov 2012 18:53:50 +0000 (19:53 +0100)]
vf_gradfun: switch to filter_frame, this filter did not support slices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 18:45:48 +0000 (19:45 +0100)]
vf_frei0r: switch to filter_frame, the filter did not support slices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 28 Nov 2012 18:56:18 +0000 (19:56 +0100)]
lavfi/edgedetect: switch to filter_frame.
Anton Khirnov [Wed, 28 Nov 2012 18:28:41 +0000 (19:28 +0100)]
vf_fps: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 17:50:44 +0000 (18:50 +0100)]
vf_fieldorder: switch to filter_frame, this filter did not support real slices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 18:13:51 +0000 (19:13 +0100)]
libavfilter/fifo: fix indent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 18:12:42 +0000 (19:12 +0100)]
vf_boxblur: cosmetics to reduce diff to qatar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 17:07:51 +0000 (18:07 +0100)]
vf_drawtext: switch to filter_frame, this filter did not support slices
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 17:05:40 +0000 (18:05 +0100)]
vf_delogo: switch to filter_frame, this filter did not support slices
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 17:05:09 +0000 (18:05 +0100)]
vf_hqdn3d: fix permissions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 17:03:03 +0000 (18:03 +0100)]
vf_delogo: fix order of operations in apply_delogo()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 16:33:07 +0000 (17:33 +0100)]
vf_boxblur: switch to filter_frame, boxblur did not support slices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 16:19:06 +0000 (17:19 +0100)]
libavfilter/fifo: switch to filter_frame, the filter did not support slices.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 28 Nov 2012 16:20:08 +0000 (16:20 +0000)]
pgssubdec: remove unused variable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 28 Nov 2012 15:53:25 +0000 (15:53 +0000)]
iff demuxer: 16SV support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Wed, 28 Nov 2012 15:41:17 +0000 (16:41 +0100)]
vf_hqdn3d: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 15:40:15 +0000 (16:40 +0100)]
libavfilter: update doxy for filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 15:39:04 +0000 (16:39 +0100)]
libavfilter: Support using filter_frame for video
With this we can mix filters using filter_frame OR start/draw_slice/end
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 15:36:18 +0000 (16:36 +0100)]
default_filter_frame: fix argument name
Based on code by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 13:46:46 +0000 (14:46 +0100)]
avfilter: check that filter_frame and slice variants are not both used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 12:53:48 +0000 (13:53 +0100)]
lavfi: replace filter_samples by filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Tue, 27 Nov 2012 20:55:28 +0000 (21:55 +0100)]
vc1dec: add hacks to ensure static tables are initialized in open().
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 27 Nov 2012 20:10:12 +0000 (21:10 +0100)]
Use err_out label for error-case cleanup.
Will simplify future changes (introducing proper
locking around opening/closing parsers).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Reimar Döffinger [Tue, 27 Nov 2012 19:48:17 +0000 (20:48 +0100)]
atrac3: do not use init_static_data to init VLC data.
It would be called while registering the codec, which means
it needlessly wastes memory when it is never used.
Instead do the work when first opening the codec.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Paul B Mahol [Wed, 28 Nov 2012 13:03:48 +0000 (13:03 +0000)]
avrdec: implement seeking
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 28 Nov 2012 12:32:09 +0000 (13:32 +0100)]
Merge commit '
af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1 '
* commit '
af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1 ':
asink_nullsink: plug a memory leak.
x86: h264_idct: port to cpuflags
x86: cpu: Drop unused HAVE_RWEFLAGS condition
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 12:27:18 +0000 (13:27 +0100)]
Merge commit '
f5fa03660db16f9d78abc5a626438b4d0b54f563 '
* commit '
f5fa03660db16f9d78abc5a626438b4d0b54f563 ':
vble: Do not abort decoding when version is not 1
lavr: do not pass consumed samples as a parameter to ff_audio_resample()
lavr: correct the documentation for the ff_audio_resample() return value
lavr: do not pass sample count as a parameter to ff_audio_convert()
x86: h264_weight: port to cpuflags
configure: Enable avconv filter dependencies automatically
Conflicts:
configure
libavcodec/x86/h264_weight.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 28 Nov 2012 11:02:22 +0000 (11:02 +0000)]
avrdec: sample rate takes 3 bytes not 4
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 28 Nov 2012 10:56:59 +0000 (10:56 +0000)]
avrdec: fix typo in .long_name
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Anton Khirnov [Tue, 27 Nov 2012 10:35:55 +0000 (11:35 +0100)]
asink_nullsink: plug a memory leak.
Michael Niedermayer [Wed, 28 Nov 2012 04:16:15 +0000 (05:16 +0100)]
qpeg: reset palette on seeks
Fixes Ticket1921
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 00:32:22 +0000 (01:32 +0100)]
nut: put nut PCM audio tags in front of avi tags.
This fixes correctly storing and identifying PCM in nut.
Based on patch by Luca Barbato
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 15 Jul 2012 13:43:47 +0000 (15:43 +0200)]
x86: h264_idct: port to cpuflags
Diego Biurrun [Tue, 27 Nov 2012 18:47:34 +0000 (19:47 +0100)]
x86: cpu: Drop unused HAVE_RWEFLAGS condition
The test for rweflags was dropped in a previous commit.
Stefano Sabatini [Mon, 26 Nov 2012 22:52:50 +0000 (23:52 +0100)]
doc: add ffmpeg-protocols.texi manual
Stefano Sabatini [Mon, 26 Nov 2012 22:47:56 +0000 (23:47 +0100)]
doc: move syntax and eval chapters from libavutil to ffmpeg-utils
Move utilities description to a dedicated manual, consistent with what I
did with the rest of the documentation.
Stefano Sabatini [Mon, 26 Nov 2012 22:38:32 +0000 (23:38 +0100)]
doc: add libavdevice.texi and ffmpeg-devices.texi files
Stefano Sabatini [Sun, 18 Nov 2012 12:39:18 +0000 (13:39 +0100)]
doc: add libavformat.texi and ffmpeg-formats.texi files
Stefano Sabatini [Tue, 27 Nov 2012 10:27:12 +0000 (11:27 +0100)]
lavfi/drawtext: add support to expansion of generic expressions
Piotr Bandurski [Tue, 27 Nov 2012 14:05:46 +0000 (14:05 +0000)]
vble: Do not abort decoding when version is not 1
Some combinations of OS, VirtualDub, and VBLE can accidentally
set the version to a value other than 1. Since no other version
of VBLE was ever released, simply warn about it.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Justin Ruggles [Thu, 1 Nov 2012 15:08:08 +0000 (11:08 -0400)]
lavr: do not pass consumed samples as a parameter to ff_audio_resample()
Since the resampler handles buffering of unconsumed samples internally, the
caller does not need this information.
Justin Ruggles [Thu, 1 Nov 2012 05:10:37 +0000 (01:10 -0400)]
lavr: correct the documentation for the ff_audio_resample() return value
Justin Ruggles [Thu, 1 Nov 2012 04:44:11 +0000 (00:44 -0400)]
lavr: do not pass sample count as a parameter to ff_audio_convert()
It will always be the number of samples in the input buffer, so just use that
directly instead of passing it as a separate parameter.
Diego Biurrun [Sun, 29 Jul 2012 13:54:55 +0000 (15:54 +0200)]
x86: h264_weight: port to cpuflags
Michael Niedermayer [Tue, 27 Nov 2012 19:15:32 +0000 (20:15 +0100)]
mjpegdec: dont set got_picture to 0 per frame.
Fixes Ticket1915
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 19:14:35 +0000 (20:14 +0100)]
mjpegdec: reset got_picture on errors, successful return, init and flush.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 19:13:18 +0000 (20:13 +0100)]
mjpegdec: replace returns by goto fail in frame decode.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 19:12:07 +0000 (20:12 +0100)]
mjpegdec: make sure ret is set before its used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Nov 2012 10:36:50 +0000 (10:36 +0000)]
fate: add ADPCM IMA Dialogic OKI decoder test
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 27 Nov 2012 17:06:00 +0000 (18:06 +0100)]
h264: support invalid annex B in mp4
Fixes Ticket1914
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 9 Nov 2012 12:32:38 +0000 (14:32 +0200)]
configure: Enable avconv filter dependencies automatically
This makes sure minimal configurations such as
"--disable-everything --enable-avconv" will enable the filters
necessary for running avconv, instead of just keeping avconv
disabled (even if the user specified "--enable-avconv").
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 27 Nov 2012 13:41:41 +0000 (14:41 +0100)]
ffserver remove CONFIG_NOCUTILS check
Nothing sets CONFIG_NOCUTILS, i also dont remember anything setting it in
the past.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 13:36:12 +0000 (14:36 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: set Picture.owner2 to the current thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 13:21:13 +0000 (14:21 +0100)]
Merge commit '
6e5cdf26281945ddea3aaf5eca4d127791f23ca8 '
* commit '
6e5cdf26281945ddea3aaf5eca4d127791f23ca8 ':
h264: check ref_count validity for num_ref_idx_active_override_flag
h264: add missing new line to log message
dcadec: skip QMF on unused channels
wavenc: write fact chunk sample count at the correct file position
riff: do not add empty metadata tags in INFO chunk
Conflicts:
libavcodec/dcadec.c
libavcodec/h264.c
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 13:03:57 +0000 (14:03 +0100)]
Merge commit '
3c370f5abc55739a261534b9f9bdc739cedbbbb9 '
* commit '
3c370f5abc55739a261534b9f9bdc739cedbbbb9 ':
riff: only warn on a bad INFO chunk code size instead of failing
configure: Add separate list for libraries and use where appropriate
x86: float_dsp: add SSE version of vector_fmul_scalar()
Conflicts:
configure
libavformat/riff.c
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 12:39:52 +0000 (13:39 +0100)]
Merge commit '
284ea790d89441fa1e6b2d72d3c1ed6d61972f0b '
* commit '
284ea790d89441fa1e6b2d72d3c1ed6d61972f0b ':
dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
aacenc: use the correct output buffer
aacdec: fix signed overflows in lcg_random()
base64: fix signed overflow in shift
Conflicts:
libavcodec/dsputil.c
libavutil/base64.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 12:12:49 +0000 (13:12 +0100)]
file: fix 10l error in access() check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Sun, 25 Nov 2012 18:42:16 +0000 (19:42 +0100)]
h264: set Picture.owner2 to the current thread
This does not seem to have an effect currently. Fate-h264 passes with
THREADS=1..16 and both threading types as before. It fixes however a
segfault during error resilience with my adaptive-frame-mt patchset.
A picture in use during error resilience gets realloced in another
thread in the fuzzed sample sample_varPAR.avi_s226019.
Janne Grunau [Sun, 25 Nov 2012 15:02:02 +0000 (16:02 +0100)]
h264: check ref_count validity for num_ref_idx_active_override_flag
Fixes segfault in the fuzzed sample bipbop234.ts_s226407.
CC: libav-stable@libav.org
Janne Grunau [Wed, 21 Nov 2012 19:13:15 +0000 (20:13 +0100)]
h264: add missing new line to log message
Paul B Mahol [Mon, 26 Nov 2012 12:49:46 +0000 (12:49 +0000)]
AFC demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 27 Nov 2012 10:12:28 +0000 (10:12 +0000)]
astdec: improve probing
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Mark Himsley [Sun, 25 Nov 2012 15:24:29 +0000 (15:24 +0000)]
lavfi/overlay: enable yuva420p as overlay background
Same calculation as for RGBA etc to create unpremultiplied output.
Useful for creating an intermediate "Mix/Effects bank", in vision mixer
(switcher) terminology.
Example command:
ffmpeg -i input.mov -vf
"[in]scale=iw:ih:interl=1,format=yuv420p[bg];movie=BBC_blocks_watermark.png,scale=iw:ih:interl=1,format=yuva420p[dog];movie=Kickabout_strap.mov,scale=iw:ih:interl=1,format=yuva420p[strap];[strap][dog]overlay=0:0[me1];[bg][me1]overlay=0:0,scale=0:0:interl=1[out]"
-b:v 3M -an output.mov
Fix trac ticket #549.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Tue, 27 Nov 2012 03:33:25 +0000 (04:33 +0100)]
cafdec: fix seeking with adpcm
Fixes Ticket1906
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 03:57:18 +0000 (04:57 +0100)]
file: Fallback to stat() based file_check() when access() or its named flags are unavailable.
Should fix compilation on native windows
We could also use _access() and literal numbers as flags but i cant test it
and the compilation failure should be fixed ASAP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 27 Nov 2012 03:55:26 +0000 (04:55 +0100)]
configure: check for access()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Oct 2012 04:21:47 +0000 (05:21 +0100)]
dcadec: skip QMF on unused channels
When the extra rear channel is present but unused, the
s->channel_order_tab[] value for that channel is -1. The QMF can be
skipped for the extra channel, and doing so avoids an out-of-array read
on s->samples_chanptr[].
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Tue, 27 Nov 2012 01:57:20 +0000 (02:57 +0100)]
file: fix file_check()
Fixes Ticket1904
This should work on windows, but if not please contact me ASAP
i have another idea on how to solve this without access() if that
really doesnt work on windows.
Strongly based on patch by divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Oct 2012 20:48:39 +0000 (21:48 +0100)]
wavenc: write fact chunk sample count at the correct file position
Fixes curruption of metadata in the INFO chunk.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Justin Ruggles [Sun, 25 Nov 2012 17:38:58 +0000 (12:38 -0500)]
riff: only warn on a bad INFO chunk code size instead of failing
fixes Bug 392
Justin Ruggles [Sun, 25 Nov 2012 17:40:54 +0000 (12:40 -0500)]
riff: do not add empty metadata tags in INFO chunk
Diego Biurrun [Sun, 11 Nov 2012 12:37:40 +0000 (13:37 +0100)]
configure: Add separate list for libraries and use where appropriate
Michael Niedermayer [Mon, 26 Nov 2012 20:26:24 +0000 (21:26 +0100)]
get_dc: fix rounding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Nov 2012 19:17:16 +0000 (20:17 +0100)]
af_aresample: consistently use ROUNDED_DIV
This fixes issues with negative timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Nov 2012 19:16:25 +0000 (20:16 +0100)]
mpeg4videodec: use ROUNDED_DIV for pts calculation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 26 Nov 2012 19:52:40 +0000 (19:52 +0000)]
adpcm: thp, afc: support multichannel decoding
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Sergio Garcia Murillo [Mon, 26 Nov 2012 16:19:56 +0000 (17:19 +0100)]
h264: Fix minor bug in h264.c error trace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sat, 22 Sep 2012 22:41:25 +0000 (18:41 -0400)]
x86: float_dsp: add SSE version of vector_fmul_scalar()
Justin Ruggles [Sat, 22 Sep 2012 22:13:57 +0000 (18:13 -0400)]
dsputil: move vector_fmul_scalar() to AVFloatDSPContext in libavutil
Michael Niedermayer [Mon, 26 Nov 2012 15:30:51 +0000 (10:30 -0500)]
aacenc: use the correct output buffer
This fixes segfault caused by
3d3cf6745e2a5dc9c377244454c3186d75b177fa
when SingleChannelElement.ret was renamed to SingleChannelElement.ret_buf.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Mon, 26 Nov 2012 15:25:47 +0000 (16:25 +0100)]
af_aresample: fix rounding of negative timestamps
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Nov 2012 15:17:55 +0000 (16:17 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: avoid integer overflow in ff_compute_frame_duration()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Nov 2012 15:09:46 +0000 (16:09 +0100)]
Merge commit '
5ae72f54532960cb9eae82a1c9e8d505106c022b '
* commit '
5ae72f54532960cb9eae82a1c9e8d505106c022b ':
flashsv: check for keyframe before using differential coding
h264: enable low delay only if no delayed frames were seen
x86: fix build without inline asm
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Nov 2012 14:15:02 +0000 (15:15 +0100)]
Merge commit '
3d3cf6745e2a5dc9c377244454c3186d75b177fa '
* commit '
3d3cf6745e2a5dc9c377244454c3186d75b177fa ':
aacdec: use float planar sample format for output
Conflicts:
libavcodec/aacdec.c
libavcodec/aacsbr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mans Rullgard [Sat, 24 Nov 2012 13:12:47 +0000 (13:12 +0000)]
aacdec: fix signed overflows in lcg_random()
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 24 Nov 2012 13:03:53 +0000 (13:03 +0000)]
base64: fix signed overflow in shift
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Mon, 26 Nov 2012 13:24:14 +0000 (14:24 +0100)]
Merge commit '
8e134e5104e99a69cd4cea10540a7ce9c3682a2c '
* commit '
8e134e5104e99a69cd4cea10540a7ce9c3682a2c ':
lavc: clarify get_buffer() documentation
mpegaudiodec: use planar sample format for output unless packed is requested
x86: h264 qpel: use the correct number of utilized xmm regs in cglobal
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 26 Nov 2012 12:59:41 +0000 (13:59 +0100)]
dsputil_mmx: ff_put_dirac_pixels depend now on yasm.
Fix compile failure without yasm
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>