lp:~saiarcot895/libopenshot/qt-json

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:libopenshot/0.0

OpenShot Code: Pending requested 2015-10-04

Diff: 10412 lines (+959/-7310)

74 files modified

include/ChunkReader.h (+2/-2)
include/ChunkWriter.h (+0/-1)
include/Clip.h (+2/-2)
include/ClipBase.h (+4/-4)
include/Color.h (+2/-2)
include/Coordinate.h (+2/-2)
include/DecklinkReader.h (+2/-2)
include/DummyReader.h (+2/-2)
include/EffectBase.h (+3/-3)
include/EffectInfo.h (+1/-1)
include/FFmpegReader.h (+2/-2)
include/FrameMapper.h (+2/-2)
include/ImageReader.h (+2/-2)
include/Json.h (+5/-1)
include/KeyFrame.h (+2/-2)
include/Point.h (+2/-2)
include/Profiles.h (+2/-2)
include/QtImageReader.h (+2/-2)
include/ReaderBase.h (+4/-4)
include/TextReader.h (+2/-2)
include/Timeline.h (+6/-6)
include/WriterBase.h (+4/-4)
include/effects/Brightness.h (+2/-2)
include/effects/ChromaKey.h (+2/-2)
include/effects/Deinterlace.h (+2/-2)
include/effects/Mask.h (+2/-2)
include/effects/Negate.h (+2/-2)
include/effects/Saturation.h (+2/-2)
src/CMakeLists.txt (+1/-10)
src/ChunkReader.cpp (+59/-48)
src/Clip.cpp (+84/-78)
src/ClipBase.cpp (+22/-22)
src/Color.cpp (+20/-15)
src/Coordinate.cpp (+25/-19)
src/DecklinkReader.cpp (+14/-10)
src/DummyReader.cpp (+16/-11)
src/EffectBase.cpp (+25/-20)
src/EffectInfo.cpp (+5/-3)
src/FFmpegReader.cpp (+21/-14)
src/FrameMapper.cpp (+17/-12)
src/ImageReader.cpp (+19/-14)
src/KeyFrame.cpp (+21/-16)
src/Point.cpp (+21/-16)
src/Profiles.cpp (+38/-30)
src/QtImageReader.cpp (+19/-13)
src/ReaderBase.cpp (+76/-78)
src/TextReader.cpp (+31/-26)
src/Timeline.cpp (+93/-81)
src/WriterBase.cpp (+88/-84)
src/effects/Brightness.cpp (+26/-18)
src/effects/ChromaKey.cpp (+25/-17)
src/effects/Deinterlace.cpp (+23/-15)
src/effects/Mask.cpp (+35/-27)
src/effects/Negate.cpp (+20/-12)
src/effects/Saturation.cpp (+22/-14)
tests/Clip_Tests.cpp (+24/-20)
tests/ReaderBase_Tests.cpp (+2/-2)
thirdparty/jsoncpp/LICENSE (+0/-1)
thirdparty/jsoncpp/include/json/autolink.h (+0/-19)
thirdparty/jsoncpp/include/json/config.h (+0/-43)
thirdparty/jsoncpp/include/json/features.h (+0/-42)
thirdparty/jsoncpp/include/json/forwards.h (+0/-39)
thirdparty/jsoncpp/include/json/json.h (+0/-10)
thirdparty/jsoncpp/include/json/reader.h (+0/-196)
thirdparty/jsoncpp/include/json/value.h (+0/-1069)
thirdparty/jsoncpp/include/json/writer.h (+0/-174)
thirdparty/jsoncpp/src/lib_json/json_batchallocator.h (+0/-125)
thirdparty/jsoncpp/src/lib_json/json_internalarray.inl (+0/-448)
thirdparty/jsoncpp/src/lib_json/json_internalmap.inl (+0/-607)
thirdparty/jsoncpp/src/lib_json/json_reader.cpp (+0/-883)
thirdparty/jsoncpp/src/lib_json/json_value.cpp (+0/-1717)
thirdparty/jsoncpp/src/lib_json/json_valueiterator.inl (+0/-292)
thirdparty/jsoncpp/src/lib_json/json_writer.cpp (+0/-828)
thirdparty/jsoncpp/src/lib_json/sconscript (+0/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

478. By Saikrishna Arcot on 2015-10-04

Switch from JsonCPP to Qt JSON.

477. By Jonathan Thomas on 2015-10-02

Added dropdown choices into JSON properties, so a UI can correctly list the options for certain properties. Fixed a bug when deleting all Points from a Keyframe, and added some missing Enums from the Python/Ruby bindings.

476. By Jonathan Thomas on 2015-10-01

Fixed a few issues with Color keyframes

475. By Jonathan Thomas on 2015-10-01

Attempting to fix a race condition when edits are being made to the timeline while frames are being cached and played back. This seems to fix the crashes for me. =)

474. By Jonathan Thomas on 2015-10-01

Fixing a bug for newer versions of LibAV and FFmpeg, regarding error codes

473. By Jonathan Thomas on 2015-09-30

Bumping version to 0.0.6-4

472. By Jonathan Thomas on 2015-09-30

Fixed small issue with unit test

471. By Jonathan Thomas on 2015-09-30

Setting height, width, and format of AVFrame struct used for encoding video, as is now required on newer versions of libAV and FFmpeg.

470. By Jonathan Thomas on 2015-09-29

Fixing a small regression with the new unit test Tests.h header.

469. By Jonathan Thomas on 2015-09-29

Windows now passes most unit tests. Added header macro to assist on passing correct test media paths to unit tests. Also added a new info parameter has_single_image, which is used to optomize the frame mapper class for images with long durations.