diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-22 03:50:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-22 03:54:30 +0200 |
| commit | 8772156be0725fd20d948a855616fe155fafdc09 (patch) | |
| tree | 35a59d27786b602b70c98fd1b9c41ab6b47e95cf /doc | |
| parent | 89f903b3d5ec38c9c5d90fba7e626fa0eda61a32 (diff) | |
| parent | b4a53314f115a47567b77004e02dd317e0e29ad9 (diff) | |
| download | ffmpeg-8772156be0725fd20d948a855616fe155fafdc09.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition.
Introduce slice threads flag.
FATE: allow forcing thread-type when doing threaded fate runs.
Use av_log_ask_for_sample() where appropriate.
error: sort, pack, and align error code and string definitions
The stabilization period after version bumps should be one month, not one week.
applehttp: Expose the stream bitrate via metadata
doc: Add some initial docs on the applehttp demuxer
Provide a fallback version of the libm function trunc
libavdevice: Define _XOPEN_SOURCE for usleep
lavc: provide deprecated avcodec_thread_init until next major version
lavc: provide the opt.h header until the next bump
error: change AVERROR_EOF value
error: remove AVERROR_NUMEXPECTED
error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c
Conflicts:
libavcodec/h264.c
libavutil/error.c
libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 8 | ||||
| -rw-r--r-- | doc/demuxers.texi | 11 |
2 files changed, 17 insertions, 2 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index aadf7b027e..8b1130b3f4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -1,5 +1,6 @@ -Never assume the API of libav* to be stable unless at least 1 week has passed since -the last major version increase. +Never assume the API of libav* to be stable unless at least 1 month has passed +since the last major version increase. + The last version increases were: libavcodec: 2011-04-18 libavdevice: 2011-04-18 @@ -12,6 +13,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2011-04-21 - 94f7451 - lavc 53.1.0 - avcodec.h + Add CODEC_CAP_SLICE_THREADS for codecs supporting sliced threading. + 2011-04-15 - lavc 52.120.0 - avcodec.h AVPacket structure got additional members for passing side information: 4de339e introduce side information for AVPacket diff --git a/doc/demuxers.texi b/doc/demuxers.texi index 05316ce5cd..ffaadfe4f9 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -64,4 +64,15 @@ Note that the pattern must not necessarily contain "%d" or ffmpeg -f image2 -i img.jpeg img.png @end example +@section applehttp + +Apple HTTP Live Streaming demuxer. + +This demuxer presents all AVStreams from all variant streams. +The id field is set to the bitrate variant index number. By setting +the discard flags on AVStreams (by pressing 'a' or 'v' in ffplay), +the caller can decide which variant streams to actually receive. +The total bitrate of the variant that the stream belongs to is +available in a metadata key named "variant_bitrate". + @c man end INPUT DEVICES |