diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-06 02:59:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-06 02:59:49 +0200 |
| commit | 11d78415ca1beaa39303c280d7896024edc45aa7 (patch) | |
| tree | cea1da5ffc8ae3e09d7375241a1a334e27703610 /libavcodec/utils.c | |
| parent | ee6db0de3760ceb7b7a9968a5322c1d8e8e23861 (diff) | |
| parent | 5371803dd5d9f7bbc62d68274084d25f10a8dc61 (diff) | |
| download | ffmpeg-11d78415ca1beaa39303c280d7896024edc45aa7.tar.gz | |
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>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 42689e03b9..a75c9ce7ea 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1337,7 +1337,6 @@ void ff_thread_await_progress(AVFrame *f, int progress, int field) int avcodec_thread_init(AVCodecContext *s, int thread_count) { s->thread_count = thread_count; - s->thread_type = FF_THREAD_FRAME | FF_THREAD_SLICE; return ff_thread_init(s); } |