summaryrefslogtreecommitdiff
path: root/libavcodec/psymodel.h
Commit message (Collapse)AuthorAge
* Merge remote branch 'qatar/master'Michael Niedermayer2011-05-09
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Fix an oob array read. cosmetics: trim trailing whitespace in postproc Ban strncpy() it's too easy to misuse. psymodel: Remove wrapper functions. aacenc: Replace loop counters in aac_encode_frame() with more descriptive 'ch' and 'w'. regtest: remove redundant flags in jpg test regtest: use run_ffmpeg in do_image_formats regtest: simplify encoding functions ffmpeg.c: check for interlaced flag in the correct place. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * psymodel: Remove wrapper functions.Nathan Caldwell2011-05-08
| | | | | | | | Instead use the function pointers directly.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: psymodel: extend API to include PE and bit allocation. avio: always compile dyn_buf functions Remove unnecessary parameter from ff_thread_init() and fix behavior Revert "aac_latm_dec: use aac context and aac m4ac" configure: tell user if libva is enabled like the rest of external libs. Add silence support for AV_SAMPLE_FMT_U8. avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal avio: deprecate av_url_read_seek avio: deprecate av_url_read_pause ac3enc: NEON optimised extract_exponents Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * psymodel: extend API to include PE and bit allocation.Nathan Caldwell2011-04-05
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* psymodel: Const correct FFPsyWindowInfo.Alex Converse2010-08-30
| | | | Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Pretty print the AAC encoder.Alex Converse2009-07-08
| | | | Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge the AAC encoder from SoC svn. It is still considered experimental.Alex Converse2009-07-08
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk