[FFmpeg-cvslog] Merge remote-tracking branch 'newdev/master'

[Reimar Döffinger]

On 31 Mar 2011, at 13:10, git at videolan.org (Michael Niedermayer) wrote:
> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 31 12:47:35 2011 +0200| [1caa4123bd83f8b1f8a4e11a8d8539be7d54b105] | committer: Michael Niedermayer
> 
> 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

Not important, but in case you can think of a good way to handle it:
That last one was already applied by me, and actually with a useful description, so that one shouldn't have changed anything.
>