diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 00:22:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 00:42:47 +0200 |
| commit | b6850e132f36f5e467b949c36666787b4c2f1331 (patch) | |
| tree | 967500c7bc8ca946ede101e274a742d1e83a2de3 /libavfilter/af_ashowinfo.c | |
| parent | 37af48717067a2080d7f8cf186011251b17c9529 (diff) | |
| parent | 9c21c08fa7c5d0c8391c8b6f47c61a8d4d9f040d (diff) | |
| download | ffmpeg-b6850e132f36f5e467b949c36666787b4c2f1331.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_ashowinfo.c')
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index a68212c7bb..ee95029a3a 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -68,7 +68,7 @@ static void dump_matrixenc(AVFilterContext *ctx, AVFrameSideData *sd) enc = *(enum AVMatrixEncoding *)sd->data; switch (enc) { case AV_MATRIX_ENCODING_NONE: av_log(ctx, AV_LOG_INFO, "none"); break; - case AV_MATRIX_ENCODING_DOLBY: av_log(ctx, AV_LOG_INFO, "Dolby"); break; + case AV_MATRIX_ENCODING_DOLBY: av_log(ctx, AV_LOG_INFO, "Dolby Surround"); break; case AV_MATRIX_ENCODING_DPLII: av_log(ctx, AV_LOG_INFO, "Dolby Pro Logic II"); break; case AV_MATRIX_ENCODING_DPLIIX: av_log(ctx, AV_LOG_INFO, "Dolby Pro Logic IIx"); break; case AV_MATRIX_ENCODING_DPLIIZ: av_log(ctx, AV_LOG_INFO, "Dolby Pro Logic IIz"); break; |