1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Commit Graph

27 Commits

Author SHA1 Message Date
Michael Niedermayer
13795dbb64 Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
  avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
  rsodec: Use avpriv_report_missing_feature() where appropriate

Conflicts:
	libavcodec/anm.c
	libavcodec/mlpdec.c
	libavcodec/pictordec.c
	libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14 12:52:12 +01:00
Diego Biurrun
6d97484d72 avcodec: av_log_ask_for_sample() ---> avpriv_request_sample() 2013-03-13 21:20:12 +01:00
Michael Niedermayer
30bce34b67 vpriv_adx_decode_header: avoid underreading the array.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 19:16:08 +01:00
Martin Storsjö
1d9c2dc89a Don't include common.h from avutil.h
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-15 22:32:06 +03:00
Justin Ruggles
6fd075f180 adxdec: Validate channel count to fix a division by zero. 2012-01-03 16:28:17 -05:00
Justin Ruggles
9d2dd356c2 adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
It is used by the ADX decoder, and therefore needs to be exported in order to
work with shared libs.
2011-11-26 17:00:00 -05:00
Justin Ruggles
d8cec2d7fc adx: move header decoding to ADX common code 2011-11-26 16:25:07 -05:00
Justin Ruggles
b237248e29 adx: calculate correct LPC coeffs
Instead of using fixed coefficients, the correct way is to calculate the
coefficients using the highpass cutoff frequency from the ADX stream header
and the sample rate.
2011-11-26 16:25:06 -05:00
Aurelien Jacobs
76c443c6d4 move adx.c to adxdec.c
Originally committed as revision 10904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 18:40:42 +00:00
Aurelien Jacobs
c31dea6136 split adx encoder in its own file
Originally committed as revision 10903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 18:38:15 +00:00
Aurelien Jacobs
4f95f80e2d remove useless debug func
Originally committed as revision 10902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 18:03:26 +00:00
Aurelien Jacobs
c4cc361099 cleanup and simplify adx_decode_header()
Originally committed as revision 10900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 17:58:03 +00:00
Aurelien Jacobs
6177c7efe1 remove useless initialization to 0 of adx context
Originally committed as revision 10899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-01 17:50:05 +00:00
Kostya Shishkov
4783cf0d09 Do not try to decode more data than output buffer may hold
Originally committed as revision 10560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-24 03:32:24 +00:00
Aurelien Jacobs
295f373792 various simplifications around recent av_clip_int16() usage
Originally committed as revision 10080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 23:17:03 +00:00
Aurelien Jacobs
aee481cebe use av_clip_int16() where it makes sense
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 22:48:55 +00:00
Ramiro Polla
67a5daf07f Remove duplicate bytestream functions
Originally committed as revision 9108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-23 14:55:13 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Måns Rullgård
7239fb5738 make the adx adpcm codec available
Originally committed as revision 5679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 22:31:14 +00:00
Luca Barbato
f3a30e3a9c cleanup patch from Diego Pettenò <flameeyes@gentoo.org>
Originally committed as revision 5526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-25 17:37:12 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
Michel Bardiaux
9b87956678 av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
Originally committed as revision 2469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 13:26:22 +00:00
Panagiotis Issaris
1b245cc21c Fixes GCC 3.3.2 warnings patch by (Panagiotis Issaris <takis at lumumba dot luc dot ac dot be>)
Originally committed as revision 2427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-24 20:09:30 +00:00
Mike Melanson
f19af812a3 replace file to remove nasty DOS CRs and hard tabs
Originally committed as revision 2384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-15 03:14:14 +00:00
Mike Melanson
f561046686 added CRI ADX and XA ADPCM audio modules, courtesy of BERO
<bero -at- geocities.co.jp>

Originally committed as revision 2376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-14 04:40:53 +00:00