1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-20 07:48:15 +02:00
FFmpeg/libavcodec
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
..
2011-04-06 02:59:49 +02:00
2011-04-05 02:31:56 +02:00
2011-04-06 02:59:49 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-04-05 02:31:56 +02:00
2011-03-28 00:16:44 +02:00
2011-03-28 00:16:44 +02:00
2011-04-04 02:15:12 +02:00
2011-04-02 18:19:01 +02:00
2011-04-02 19:26:58 +02:00
2011-04-03 16:40:10 +02:00
2011-04-02 01:54:27 +02:00
2011-04-04 02:15:12 +02:00
2011-04-04 02:15:12 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-06 01:09:04 +02:00
2011-04-03 02:28:01 +02:00
2011-04-02 01:54:27 +02:00
2011-03-28 21:50:46 -07:00
2011-04-06 01:09:04 +02:00
2011-04-06 01:09:04 +02:00
2011-04-04 02:15:12 +02:00
2011-04-03 02:28:01 +02:00
2011-04-06 02:59:49 +02:00
2011-04-03 16:40:12 +02:00
2011-04-03 16:40:12 +02:00
2011-04-03 02:28:01 +02:00
2011-03-19 15:24:31 +00:00
2011-03-28 00:16:44 +02:00
2011-04-03 02:28:01 +02:00
2011-04-03 02:28:01 +02:00
2011-04-06 02:59:49 +02:00
2011-04-04 15:35:03 +02:00