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 /libavformat/url.h | |
| parent | ee6db0de3760ceb7b7a9968a5322c1d8e8e23861 (diff) | |
| parent | 5371803dd5d9f7bbc62d68274084d25f10a8dc61 (diff) | |
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 'libavformat/url.h')
| -rw-r--r-- | libavformat/url.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/url.h b/libavformat/url.h index 2110129cb1..97652bb972 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -26,6 +26,11 @@ #define AVFORMAT_URL_H #include "avio.h" +#include "libavformat/version.h" + +#if !FF_API_OLD_AVIO +#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ +#endif /** * Create a URLContext for accessing to the resource indicated by |