[FFmpeg-cvslog] avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again

Michael Niedermayer git at videolan.org
Sat Apr 16 02:02:30 CEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Apr 15 19:49:27 2016 +0200| [c4fad02779911d9fc35c513286c89e631ba81967] | committer: Michael Niedermayer

avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again

Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/matroskaenc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 2be0629..205bc1c 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -910,8 +910,8 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
     }
 
     if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) {
-        if (par->bits_per_coded_sample)
-            bit_depth = par->bits_per_coded_sample;
+        if (par->bits_per_raw_sample)
+            bit_depth = par->bits_per_raw_sample;
         else
             bit_depth = av_get_bytes_per_sample(par->format) << 3;
     }



More information about the ffmpeg-cvslog mailing list