[FFmpeg-cvslog] Revert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs."

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Aug  1 03:25:04 2015 +0200| [b27d4fd99736ec3676441934aaf3221f80777211] | committer: Michael Niedermayer

Revert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs."

Requested-by: Ganesh Ajjanagadde <gajjanag at mit.edu> (original patch reviewer)
This reverts commit 293e25be615d43c9b611c4b04920ec0d245a7145.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b27d4fd99736ec3676441934aaf3221f80777211
---

 libavcodec/utils.c |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 52bfe01..5dbd0cf 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -3311,11 +3311,6 @@ void avcodec_flush_buffers(AVCodecContext *avctx)
 int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
 {
     switch (codec_id) {
-    case AV_CODEC_ID_DSD_LSBF:
-    case AV_CODEC_ID_DSD_MSBF:
-    case AV_CODEC_ID_DSD_LSBF_PLANAR:
-    case AV_CODEC_ID_DSD_MSBF_PLANAR:
-        return 1;
     case AV_CODEC_ID_8SVX_EXP:
     case AV_CODEC_ID_8SVX_FIB:
     case AV_CODEC_ID_ADPCM_CT:
@@ -3326,6 +3321,10 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
     case AV_CODEC_ID_ADPCM_G722:
     case AV_CODEC_ID_ADPCM_YAMAHA:
         return 4;
+    case AV_CODEC_ID_DSD_LSBF:
+    case AV_CODEC_ID_DSD_MSBF:
+    case AV_CODEC_ID_DSD_LSBF_PLANAR:
+    case AV_CODEC_ID_DSD_MSBF_PLANAR:
     case AV_CODEC_ID_PCM_ALAW:
     case AV_CODEC_ID_PCM_MULAW:
     case AV_CODEC_ID_PCM_S8: