deleted:    codelite/joisc/ivs.mk
	deleted:    codelite/joisc/ivs.project
	modified:   codelite/joisc/joisc.tags
	modified:   codelite/joisc/joisc.workspace
	modified:   codelite/joisc/joisc.workspace.session
	modified:   codelite/joisc/joisc_wsp.mk
	modified:   codelite/joiss/HikSdkHost.project
	deleted:    include/ffmpeg/inttypes.h
	deleted:    include/ffmpeg/libavcodec/avcodec.h
	deleted:    include/ffmpeg/libavcodec/avfft.h
	deleted:    include/ffmpeg/libavcodec/dxva2.h
	deleted:    include/ffmpeg/libavcodec/opt.h
	deleted:    include/ffmpeg/libavcodec/vaapi.h
	deleted:    include/ffmpeg/libavcodec/vdpau.h
	deleted:    include/ffmpeg/libavcodec/xvmc.h
	deleted:    include/ffmpeg/libavcore/audioconvert.h
	deleted:    include/ffmpeg/libavcore/avcore.h
	deleted:    include/ffmpeg/libavcore/imgutils.h
	deleted:    include/ffmpeg/libavcore/parseutils.h
	deleted:    include/ffmpeg/libavcore/samplefmt.h
	deleted:    include/ffmpeg/libavdevice/avdevice.h
	deleted:    include/ffmpeg/libavfilter/avfilter.h
	deleted:    include/ffmpeg/libavfilter/avfiltergraph.h
	deleted:    include/ffmpeg/libavformat/avformat.h
	deleted:    include/ffmpeg/libavformat/avio.h
	deleted:    include/ffmpeg/libavutil/adler32.h
	deleted:    include/ffmpeg/libavutil/attributes.h
	deleted:    include/ffmpeg/libavutil/avassert.h
	deleted:    include/ffmpeg/libavutil/avconfig.h
	deleted:    include/ffmpeg/libavutil/avstring.h
	deleted:    include/ffmpeg/libavutil/avutil.h
	deleted:    include/ffmpeg/libavutil/base64.h
	deleted:    include/ffmpeg/libavutil/bswap.h
	deleted:    include/ffmpeg/libavutil/common.h
	deleted:    include/ffmpeg/libavutil/cpu.h
	deleted:    include/ffmpeg/libavutil/crc.h
	deleted:    include/ffmpeg/libavutil/error.h
	deleted:    include/ffmpeg/libavutil/eval.h
	deleted:    include/ffmpeg/libavutil/fifo.h
	deleted:    include/ffmpeg/libavutil/file.h
	deleted:    include/ffmpeg/libavutil/intfloat_readwrite.h
	deleted:    include/ffmpeg/libavutil/intreadwrite.h
	deleted:    include/ffmpeg/libavutil/lfg.h
	deleted:    include/ffmpeg/libavutil/log.h
deleted:    include/ffmpeg/libavutil/lzo.h
	deleted:    include/ffmpeg/libavutil/mathematics.h
	deleted:    include/ffmpeg/libavutil/md5.h
	deleted:    include/ffmpeg/libavutil/mem.h
	deleted:    include/ffmpeg/libavutil/opt.h
	deleted:    include/ffmpeg/libavutil/pixdesc.h
	deleted:    include/ffmpeg/libavutil/pixfmt.h
	deleted:    include/ffmpeg/libavutil/random_seed.h
	deleted:    include/ffmpeg/libavutil/rational.h
	deleted:    include/ffmpeg/libavutil/sha1.h
	deleted:    include/ffmpeg/libswscale/swscale.h
	deleted:    include/ffmpeg/stdint.h
	modified:   libs/linux/ffmpeg/libavcodec.a
	modified:   libs/linux/ffmpeg/libavdevice.a
	modified:   libs/linux/ffmpeg/libavfilter.a
	modified:   libs/linux/ffmpeg/libavformat.a
	modified:   libs/linux/ffmpeg/libavutil.a
	modified:   libs/linux/ffmpeg/libswresample.a
	modified:   libs/linux/ffmpeg/libswscale.a
	modified:   src/control/play/PlayManager.cpp
	modified:   src/control/play/PlayManager.h
	modified:   src/control/play/RealPlayObj.cpp
	modified:   src/control/play/RealPlayObj.h
	modified:   src/control/play/VodPlayObj.cpp
	modified:   src/control/play/VodPlayObj.h
	modified:   src/control/stream/VodMediaObj.cpp
	modified:   src/core/j_common.h
	modified:   src/core/j_module.h
	modified:   src/decoder/h264/H264Decoder.cpp
	modified:   src/decoder/h264/H264Decoder.h
	modified:   src/demo/StreamPlayer.cpp
	modified:   src/demo/StreamPlayer.h
modified:   src/demo/VodPlayer.cpp
	copied:     src/host/hiksdk/HikSdkParser2.cpp -> src/host/hiksdk/HikSdkParser.cpp
	modified:   src/host/hiksdk/HikSdkParser.h
	modified:   src/host/hiksdk/HikSdkParser2.cpp
	modified:   src/host/hiksdk/HikSdkParser2.h
	modified:   src/host/hiksdk/HikSdkRemoteReader.cpp
	modified:   src/host/hiksdk/HikSdkRemoteReader.h
	modified:   src/host/hiksdk/HikSdkStream.cpp
	modified:   src/host/hiksdk/HikSdkStream.h
	modified:   src/host/jos/JoChannel.cpp
	modified:   src/misc/x_filereader_factory.cpp
	modified:   src/misc/x_filereader_factory.h
	modified:   src/player/jo_player/JoPlayer.cpp
	modified:   src/player/jo_player/JoPlayer.h
	modified:   src/render/jo_render/JoParser.cpp
	modified:   src/render/jo_render/JoPictrue.cpp
	modified:   src/render/jo_render/JoPictrue.h
	modified:   src/render/jo_render/JoRender.h
	modified:   src/ui/wx_ivs/src/x_window.cpp
	new file:   include/linux/ffmpeg/inttypes.h
	new file:   include/linux/ffmpeg/libavcodec/avcodec.h
	new file:   include/linux/ffmpeg/libavcodec/avfft.h
	new file:   include/linux/ffmpeg/libavcodec/dxva2.h
	new file:   include/linux/ffmpeg/libavcodec/old_codec_ids.h
	new file:   include/linux/ffmpeg/libavcodec/opt.h
	new file:   include/linux/ffmpeg/libavcodec/vaapi.h
	new file:   include/linux/ffmpeg/libavcodec/vda.h
	new file:   include/linux/ffmpeg/libavcodec/vdpau.h
	new file:   include/linux/ffmpeg/libavcodec/version.h
	new file:   include/linux/ffmpeg/libavcodec/xvmc.h
	new file:   include/linux/ffmpeg/libavcore/audioconvert.h
	new file:   include/linux/ffmpeg/libavcore/avcore.h
	new file:   include/linux/ffmpeg/libavcore/imgutils.h
	new file:   include/linux/ffmpeg/libavcore/parseutils.h
	new file:   include/linux/ffmpeg/libavcore/samplefmt.h
	new file:   include/linux/ffmpeg/libavdevice/avdevice.h
	new file:   include/linux/ffmpeg/libavdevice/version.h
	new file:   include/linux/ffmpeg/libavfilter/asrc_abuffer.h
	new file:   include/linux/ffmpeg/libavfilter/avcodec.h
	new file:   include/linux/ffmpeg/libavfilter/avfilter.h
	new file:   include/linux/ffmpeg/libavfilter/avfiltergraph.h
	new file:   include/linux/ffmpeg/libavfilter/buffersink.h
	new file:   include/linux/ffmpeg/libavfilter/buffersrc.h
	new file:   include/linux/ffmpeg/libavfilter/version.h
	new file:   include/linux/ffmpeg/libavformat/avformat.h
	new file:   include/linux/ffmpeg/libavformat/avio.h
	new file:   include/linux/ffmpeg/libavformat/version.h
	new file:   include/linux/ffmpeg/libavutil/adler32.h
	new file:   include/linux/ffmpeg/libavutil/aes.h
	new file:   include/linux/ffmpeg/libavutil/attributes.h
	new file:   include/linux/ffmpeg/libavutil/audio_fifo.h
	new file:   include/linux/ffmpeg/libavutil/audioconvert.h
	new file:   include/linux/ffmpeg/libavutil/avassert.h
	new file:   include/linux/ffmpeg/libavutil/avconfig.h
	new file:   include/linux/ffmpeg/libavutil/avstring.h
	new file:   include/linux/ffmpeg/libavutil/avutil.h
	new file:   include/linux/ffmpeg/libavutil/base64.h
	new file:   include/linux/ffmpeg/libavutil/blowfish.h
	new file:   include/linux/ffmpeg/libavutil/bprint.h
	new file:   include/linux/ffmpeg/libavutil/bswap.h
	new file:   include/linux/ffmpeg/libavutil/buffer.h
	new file:   include/linux/ffmpeg/libavutil/channel_layout.h
	new file:   include/linux/ffmpeg/libavutil/common.h
	new file:   include/linux/ffmpeg/libavutil/common.h~
	new file:   include/linux/ffmpeg/libavutil/cpu.h
	new file:   include/linux/ffmpeg/libavutil/crc.h
	new file:   include/linux/ffmpeg/libavutil/dict.h
	new file:   include/linux/ffmpeg/libavutil/error.h
	new file:   include/linux/ffmpeg/libavutil/eval.h
	new file:   include/linux/ffmpeg/libavutil/fifo.h
	new file:   include/linux/ffmpeg/libavutil/file.h
	new file:   include/linux/ffmpeg/libavutil/frame.h
	new file:   include/linux/ffmpeg/libavutil/hmac.h
	new file:   include/linux/ffmpeg/libavutil/imgutils.h
	new file:   include/linux/ffmpeg/libavutil/intfloat.h
	new file:   include/linux/ffmpeg/libavutil/intfloat_readwrite.h
	new file:   include/linux/ffmpeg/libavutil/intreadwrite.h
	new file:   include/linux/ffmpeg/libavutil/lfg.h
	new file:   include/linux/ffmpeg/libavutil/log.h
	new file:   include/linux/ffmpeg/libavutil/lzo.h
	new file:   include/linux/ffmpeg/libavutil/mathematics.h
	new file:   include/linux/ffmpeg/libavutil/md5.h
	new file:   include/linux/ffmpeg/libavutil/mem.h
	new file:   include/linux/ffmpeg/libavutil/murmur3.h
	new file:   include/linux/ffmpeg/libavutil/old_pix_fmts.h
	new file:   include/linux/ffmpeg/libavutil/opt.h
	new file:   include/linux/ffmpeg/libavutil/parseutils.h
	new file:   include/linux/ffmpeg/libavutil/pixdesc.h
	new file:   include/linux/ffmpeg/libavutil/pixfmt.h
	new file:   include/linux/ffmpeg/libavutil/random_seed.h
	new file:   include/linux/ffmpeg/libavutil/rational.h
	new file:   include/linux/ffmpeg/libavutil/ripemd.h
	new file:   include/linux/ffmpeg/libavutil/samplefmt.h
	new file:   include/linux/ffmpeg/libavutil/sha.h
	new file:   include/linux/ffmpeg/libavutil/sha1.h
	new file:   include/linux/ffmpeg/libavutil/sha512.h
	new file:   include/linux/ffmpeg/libavutil/time.h
	new file:   include/linux/ffmpeg/libavutil/timecode.h
	new file:   include/linux/ffmpeg/libavutil/timestamp.h
	new file:   include/linux/ffmpeg/libavutil/version.h
	new file:   include/linux/ffmpeg/libavutil/xtea.h
	new file:   include/linux/ffmpeg/libswresample/swresample.h
	new file:   include/linux/ffmpeg/libswresample/version.h
	new file:   include/linux/ffmpeg/libswscale/swscale.h
	new file:   include/linux/ffmpeg/libswscale/version.h