summaryrefslogtreecommitdiff
path: root/libavcodec/aacps_tablegen.h
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fifo: add FIFO API test program, and fate test fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() postprocess.c: filter name needs to be double 0 terminated doxygen: fix wrong comment syntax, //< vs. ///< doxygen: drop pointless star from pointer variable names Replace deprecated av_find_stream_info() by avformat_find_stream_info(). xmv: eliminate superfluous zeroing of zero data configure: fix typo in avconv dependency list Conflicts: configure doc/APIchanges libavutil/Makefile libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: fix wrong comment syntax, //< vs. ///<Diego Biurrun2011-08-26
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Remove unnecessary ../ from include directivesMåns Rullgård2010-06-26
| | | | Originally committed as revision 23806 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move Parametric Stereo related ps* files to aacps*.Alex Converse2010-06-22
Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk