Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

FFmpeg
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

3ddf76ee

Commit 3ddf76ee authored 11 years ago by Michael Niedermayer

Downloads
- Plain Diff

Merge remote-tracking branch 'cehoyos/master'


* cehoyos/master:
  Revert "Allow stream-copying grayscale mov files."

Merged-by: Michael Niedermayer <michaelni@gmx.at>

parents 1f36ebf6 54bbe3e2

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

libavcodec/8bps.c 1 addition, 1 deletion

libavcodec/8bps.c
libavcodec/msrle.c 1 addition, 1 deletion

libavcodec/msrle.c
libavcodec/rawdec.c 4 additions, 4 deletions

libavcodec/rawdec.c
libavformat/mov.c 1 addition, 0 deletions

libavformat/mov.c

with 7 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment