]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Thu, 29 Nov 2012 01:04:45 +0000 (02:04 +0100)]
lavfi/colormatrix: switch to filter_frame.
Anton Khirnov [Thu, 29 Nov 2012 01:09:40 +0000 (02:09 +0100)]
vf_format: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 29 Nov 2012 01:09:22 +0000 (02:09 +0100)]
vf_copy: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 29 Nov 2012 01:09:01 +0000 (02:09 +0100)]
vf_null: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Nov 2012 01:03:20 +0000 (02:03 +0100)]
libavfilter: default to filter_frame when neither it nor start/slice/end is set.
this is needed for vf_null and a few others.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 29 Nov 2012 00:51:31 +0000 (01:51 +0100)]
buffersrc: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 29 Nov 2012 00:51:12 +0000 (01:51 +0100)]
buffersink: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 29 Nov 2012 00:43:28 +0000 (01:43 +0100)]
lavfi/thumbnail: re-use ctx instead of inlink->dst.
Clément Bœsch [Thu, 29 Nov 2012 00:38:08 +0000 (01:38 +0100)]
lavfi/thumbnail: use avfilter_unref_bufferp() where appropriate.
Clément Bœsch [Thu, 29 Nov 2012 00:33:25 +0000 (01:33 +0100)]
lavfi/thumbnail: switch to filter_frame.
Anton Khirnov [Thu, 29 Nov 2012 00:20:10 +0000 (01:20 +0100)]
libavfilter/split: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Nov 2012 00:19:35 +0000 (01:19 +0100)]
vf_scale: switch to filter_frame
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 28 Nov 2012 23:13:47 +0000 (00:13 +0100)]
lavfi/sendcmd: expose the options for both filters.
Clément Bœsch [Wed, 28 Nov 2012 23:13:29 +0000 (00:13 +0100)]
lavfi/sendcmd: add FLAGS to AVOption array.
Clément Bœsch [Wed, 28 Nov 2012 22:36:50 +0000 (23:36 +0100)]
lavfi: add priv_class for some forgotten filters.
This allows to print the options available when using commands such as
ffmpeg -help full.
Clément Bœsch [Wed, 28 Nov 2012 22:50:56 +0000 (23:50 +0100)]
lavfi/mptestsrc: add FLAGS to AVOption array.
Anton Khirnov [Wed, 28 Nov 2012 23:32:08 +0000 (00:32 +0100)]
vf_blackframe: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 23:31:50 +0000 (00:31 +0100)]
vf_aspect: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 23:15:56 +0000 (00:15 +0100)]
vf_cropdetect: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 23:15:40 +0000 (00:15 +0100)]
vf_crop: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 23:09:53 +0000 (00:09 +0100)]
vf_drawbox: switch to filter frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 23:09:31 +0000 (00:09 +0100)]
vflip: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 28 Nov 2012 22:59:15 +0000 (23:59 +0100)]
Merge commit '
bb6c67bb36b136de10256f0999128df4a42f9ffc '
* commit '
bb6c67bb36b136de10256f0999128df4a42f9ffc ':
lavfi: remove vf_slicify
Conflicts:
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_slicify.c
tests/lavfi-regression.sh
tests/ref/lavfi/crop_scale_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 26 Nov 2012 22:58:40 +0000 (23:58 +0100)]
doc: add ffmpeg-bitstream-filters.texi file
Anton Khirnov [Wed, 28 Nov 2012 22:46:17 +0000 (23:46 +0100)]
vf_yadif: switch to filter_frame, this filter did not support slices
signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 22:27:21 +0000 (23:27 +0100)]
vf_fade: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 28 Nov 2012 19:01:59 +0000 (20:01 +0100)]
lavfi: convert remaining input/output list compound literals to named objects.
This is following
568c70e79ee267426c15ef4603c69703f6a5884a .
Anton Khirnov [Wed, 28 Nov 2012 21:39:35 +0000 (22:39 +0100)]
vf_lut: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 21:39:16 +0000 (22:39 +0100)]
vf_hflip: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 21:27:51 +0000 (22:27 +0100)]
f_setpts: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 28 Nov 2012 21:10:29 +0000 (22:10 +0100)]
f_settb: switch to filter_frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 09:41:22 +0000 (10:41 +0100)]
lavfi: remove vf_slicify
The following commit will make it useless.
The crop_scale_vflip FATE test changes because of off-by-one differences
in output when vflipped slices are passed to sws.
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>