merge - xine-lib-1.2.2: opengl2: Moved argb layer locking to more correct place ->  ff_video_decoder: delay calling set_stream_info() instead of calling it from get_buffer()
merge - xine-lib-1.2.2:  VAAPI decoder and video output plugin from https://github.com/huceke/xine-lib-vaapi
merge - xine-lib-1.2.2: video_out: dont reuse (DR1) reference frames in paused_loop
merge - xine-lib-1.2.2:  rgb2yuy2: added 16/15/8 bit formats
merge - xine-lib-1.2.2: ff_video_dec: single-pass rgb -> yuy2 conversion
merge - xine-lib-1.2.2: ff_video_decoder: fix VAAPI decoding
merge - xine-lib-1.2.2: demux_ts: Fix some H.264 and VC1 still images
merge - xine-lib-1.2.2: video_out_opengl2: black fill new buffer
merge - xine-lib-1.2.2: ffmpeg_video_decoder: re-enabled palette video decoding
merge - xine-lib-1.2.2: ffmpeg_audio_decoder: support new av_decode_audio4 ()
merge - xine-lib-1.2.2: ffmpeg_audio_decoder: enable mpeg4 audio
merge - xine-lib-1.2.2: ffmpeg_audio_decoder: added gain control option for float -> int16 conversion
merge - xine-lib-1.2.2: add missed files
merge - xine-lib-1.2.2: vdpau: set frame cm flags in decoders
merge - xine-lib-1.2.2: vo_vdpau: color matrix and fullrange support
REVERT: merge - xine-lib-1.2.2: demux_ts: Fix some H.264 and VC1 still images (jerking images)