Skip to content

Get media properties as json #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Dec 7, 2015

Conversation

cchampet
Copy link
Member

Fix #165

@cchampet
Copy link
Member Author

cchampet commented Dec 2, 2015

TODO:

  • rename getPropertiesAs*** to as***
    See commit 8c33526
  • add FileProperties::allPropertiesAsJson()
    See commit 788ce25

Clement Champetier added 8 commits December 3, 2015 09:58
* FileProperties::asJson returns the format properties.
* FileProperties::allPropertiesAsJson returns all properties.
* It is to keep a symmetry between all 'properties' classes with their
'asJson' method.
…into dev_mediaPropertiesAsJson

Conflicts:
	src/AvTranscoder/properties/StreamProperties.cpp
@cchampet cchampet force-pushed the dev_mediaPropertiesAsJson branch from b681e78 to 14cc5e0 Compare December 4, 2015 12:42
* Added JsonStreamWriter::escapeJsonString to escape strings accordingly to the JSON standard.
@cchampet cchampet force-pushed the dev_mediaPropertiesAsJson branch from 14cc5e0 to 184a183 Compare December 4, 2015 16:20
* The error was: 'explicit specialization in non-namespace scope'.
* Solution: move the specializations of the member templates outside of
the class body.
@cchampet cchampet force-pushed the dev_mediaPropertiesAsJson branch from 42615da to 5335692 Compare December 7, 2015 09:31
cchampet added a commit that referenced this pull request Dec 7, 2015
@cchampet cchampet merged commit 17529b7 into avTranscoder:develop Dec 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants