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 /libavcodec/interplayvideo.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 'libavcodec/interplayvideo.c')
0 files changed, 0 insertions, 0 deletions