diff options
| author | Ben Murdoch <benm@google.com> | 2013-08-07 11:04:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-08-07 11:04:47 +0100 |
| commit | 3240926e260ce088908e02ac07a6cf7b0c0cbf44 (patch) | |
| tree | 5ff5fa16b2fb9278c6d731b3d19123731f3f8626 /media/base/sample_format.h | |
| parent | 3b21a50ee4fe6f71bb117cbee9998a4f465eea9d (diff) | |
| download | chromium_org-3240926e260ce088908e02ac07a6cf7b0c0cbf44.tar.gz | |
Merge from Chromium at DEPS revision r216133
This commit was generated by merge_to_master.py.
Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
Diffstat (limited to 'media/base/sample_format.h')
| -rw-r--r-- | media/base/sample_format.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/base/sample_format.h b/media/base/sample_format.h index bcaa5b2785..3d2799fa12 100644 --- a/media/base/sample_format.h +++ b/media/base/sample_format.h @@ -29,6 +29,9 @@ enum SampleFormat { // |sample_format|. MEDIA_EXPORT int SampleFormatToBytesPerChannel(SampleFormat sample_format); +// Returns the name of the sample format as a string +MEDIA_EXPORT const char* SampleFormatToString(SampleFormat sample_format); + } // namespace media #endif // MEDIA_BASE_SAMPLE_FORMAT_H |