diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 12:20:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 12:20:06 +0100 |
| commit | 3ddf76ee070d072ed4cdeb7ec6585cea3e4b72eb (patch) | |
| tree | d9fb8ca45f6644331e4b7d06d403026f36397d0a /libavformat/mov.c | |
| parent | 1f36ebf63a8d6ffccf4bf286849d77f76aad8b8f (diff) | |
| parent | 54bbe3e2a645b4f7b36efac2bca331d3be98592a (diff) | |
| download | ffmpeg-3ddf76ee070d072ed4cdeb7ec6585cea3e4b72eb.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Revert "Allow stream-copying grayscale mov files."
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 8220b5a840..7a567e4242 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1331,6 +1331,7 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb, if (color_greyscale) { int color_index, color_dec; /* compute the greyscale palette */ + st->codec->bits_per_coded_sample = color_depth; color_count = 1 << color_depth; color_index = 255; color_dec = 256 / (color_count - 1); |