-
Notifications
You must be signed in to change notification settings - Fork 50
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
cchampet
merged 22 commits into
avTranscoder:develop
from
cchampet:dev_mediaPropertiesAsJson
Dec 7, 2015
Merged
Get media properties as json #184
cchampet
merged 22 commits into
avTranscoder:develop
from
cchampet:dev_mediaPropertiesAsJson
Dec 7, 2015
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Therefore, the "null" value represents the null json element.
* getPropertiesAsJson returns all properties of the file. * This is not the case of getPropertiesAsMap/AsVector methods...
…perty Instead of an hardcoded value.
* 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
b681e78
to
14cc5e0
Compare
* Added JsonStreamWriter::escapeJsonString to escape strings accordingly to the JSON standard.
14cc5e0
to
184a183
Compare
* The error was: 'explicit specialization in non-namespace scope'. * Solution: move the specializations of the member templates outside of the class body.
42615da
to
5335692
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #165