Michael Niedermayer
|
8bc7fe4daf
|
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxygen: misc consistency, spelling and wording fixes
vcr1: drop unnecessary emms_c() calls without MMX code
Replace all uses of av_close_input_file() with avformat_close_input().
lavf: add avformat_close_input().
lavf: deprecate av_close_input_stream().
lavf doxy: add some basic demuxing documentation.
lavf doxy: add some general lavf information.
lavf doxy: add misc utility functions to a group.
lavf doxy: add av_guess_codec/format to the encoding group.
lavf doxy: add core functions to a doxy group.
Add basic libavdevice documentation.
lavc: convert error_recognition to err_recognition.
avconv: update -map option help text
x86: Require 7 registers for the cabac asm
x86: bswap: remove test for bswap instruction
bswap: make generic implementation more compiler-friendly
h264: remove useless cast
proresdec: fix decode_slice() prototype
Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-12-13 00:39:48 +01:00 |
|
Diego Biurrun
|
58c42af722
|
doxygen: misc consistency, spelling and wording fixes
|
2011-12-12 23:06:23 +01:00 |
|
Michael Niedermayer
|
78f08c06e6
|
ff_dot_product(): change return value to int64_t
Idea-by: Vitor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-10-01 23:16:25 +02:00 |
|
Michael Niedermayer
|
11512367d3
|
celp_math: cleanup ff_dot_product()
based on code & idea by vitor
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-09-29 21:44:03 +02:00 |
|
Mohamed Naufal Basheer
|
a82c6238ae
|
Add dot_product function for use by the G.723.1 decoder
|
2011-09-29 21:44:03 +02:00 |
|
Mans Rullgard
|
2912e87a6c
|
Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
2011-03-19 13:33:20 +00:00 |
|
Måns Rullgård
|
49bd8e4b84
|
Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2010-06-30 15:38:06 +00:00 |
|
Aurelien Jacobs
|
275131628d
|
Remove duplicated dot product code. Use dsputil's
scalarproduct instead. Patch by Aurelien Jacobs.
Originally committed as revision 16391 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2008-12-29 17:14:30 +00:00 |
|
Diego Biurrun
|
9686df2be5
|
Delete unnecessary 'extern' keywords.
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2008-12-03 15:23:30 +00:00 |
|
Kenan Gillet
|
0bc484ad51
|
Add ff_dot_productf() to celp_math.{c,h}
Part of the QCELP patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15753 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2008-10-30 21:04:17 +00:00 |
|
Kenan Gillet
|
60c25a4beb
|
Rename acelp_math.[ch] to celp_math.[ch] to prepare for QCELP decoder merge.
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15679 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2008-10-24 21:20:29 +00:00 |
|