opencv/modules/cudacodec/src
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
..
cuda renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
cuvid_video_source.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
cuvid_video_source.hpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
ffmpeg_video_source.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
ffmpeg_video_source.hpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
frame_queue.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
frame_queue.hpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
precomp.hpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
thread.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
thread.hpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
video_decoder.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
video_decoder.hpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
video_parser.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
video_parser.hpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
video_reader.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
video_source.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
video_source.hpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00
video_writer.cpp renamed gpucodec -> cudacodec 2013-09-02 14:00:42 +04:00