generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,342 Commits 24 Branches 241 Tags 173 MiB
67c1a59ad7
Commit Graph

6 Commits

Author SHA1 Message Date
Michael Niedermayer
11d78415ca Merge remote branch 'qatar/master' 
* 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>
 2011-04-06 02:59:49 +02:00
Nathan Caldwell
5371803dd5 psymodel: extend API to include PE and bit allocation. 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2011-04-05 22:21:04 +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
Alex Converse
0e107f7890 psymodel: Const correct FFPsyWindowInfo. 
Originally committed as revision 24999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-30 23:48:35 +00:00
Alex Converse
fd257dc4c0 Cosmetics: Pretty print the AAC encoder. 
Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 20:36:45 +00:00
Alex Converse
78e65cd772 Merge the AAC encoder from SoC svn. It is still considered experimental. 
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-08 20:01:31 +00:00