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

Requested-by: Ganesh Ajjanagadde <gajjanag@mit.edu> (original patch reviewer) This reverts commit 293e25be61.
10 years ago · b27d4fd997
parent 55ea31ab89
commit b27d4fd997
1 changed files with 4 additions and 5 deletions
--- 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: