diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-31 12:47:35 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-31 12:48:41 +0200 |
commit | 1caa4123bd83f8b1f8a4e11a8d8539be7d54b105 (patch) | |
tree | 094ece3f8531095920978d68b65e7119ab7007e7 /doc/APIchanges | |
parent | 8b8bf89e52bc3bf4be1a9f10eb1eb153a443172f (diff) | |
parent | 229e2631be528c595650a7568c1d4df8af9c4944 (diff) | |
download | ffmpeg-1caa4123bd83f8b1f8a4e11a8d8539be7d54b105.tar.gz |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
rtsp: Use GET_PARAMETER for keep-alive for generic RTSP servers
mlp_parse.c: set AVCodecContext channel_layout
APIChanges: mark the place where 0.6 was branched.
avio: make get_checksum() internal.
avio: move ff_crc04C11DB7_update() from avio.h -> avio_internal.h
avio: make init_checksum() internal.
NOT MERGED Add MxPEG decoder
NOT MERGED Add support for picture_ptr field in MJpegDecodeContext
NOT MERGED Move MJPEG's input buffer preprocessing in separate public function
NOT MERGED Support reference picture defined by bitmask in MJPEG's SOS decoder
sndio bug fix
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index c246cef2e1..6715972c8c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -462,16 +462,22 @@ API changes, most recent first: 2010-05-26 - r23334 - lavc 52.72.0 - CODEC_CAP_EXPERIMENTAL Add CODEC_CAP_EXPERIMENTAL flag. + NOTE: this was backported to 0.6 2010-05-23 - r23255 - lavu 50.16.0 - av_get_random_seed() Add av_get_random_seed(). 2010-05-18 - r23161 - lavf 52.63.0 - AVFMT_FLAG_RTP_HINT Add AVFMT_FLAG_RTP_HINT as possible value for AVFormatContext.flags. + NOTE: this was backported to 0.6 2010-05-09 - r23066 - lavfi 1.20.0 - AVFilterPicRef Add interlaced and top_field_first fields to AVFilterPicRef. +------------------------------8<------------------------------------- + 0.6 branch was cut here +----------------------------->8-------------------------------------- + 2010-05-01 - r23002 - lavf 52.62.0 - probe function Add av_probe_input_format2 to API, it allows ignoring probe results below given score and returns the actual probe score. |