diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-11 20:09:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 02:42:11 +0100 |
| commit | 3caa6a5a5744e2fafaa51fd6c3cecf4008695c48 (patch) | |
| tree | 08bcf1c1ff3387622ca21c69362d335592cc44f2 /libavformat | |
| parent | bf08665e2ededcb62eaa03d2faf8d39311a8275a (diff) | |
| download | ffmpeg-3caa6a5a5744e2fafaa51fd6c3cecf4008695c48.tar.gz | |
Revert "Allow stream-copying grayscale mov files."
This reverts commit 691dec62011fe9993809fbc793126b40cac0c584.
The commit did not fix ticket #3215, it was fixed one commit earlier.
The revert may break other use-cases but they should be fixed differently,
the offending commit introduced too many problems.
Fixes ticket #3377.
Fixes ticket #3378.
(cherry picked from commit 54bbe3e2a645b4f7b36efac2bca331d3be98592a)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -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 c14e3c15e5..3434d4f100 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1330,6 +1330,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); |