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

62094e2f

Commit 62094e2f authored 11 years ago by Michael Niedermayer

Downloads
- Plain Diff

Merge remote-tracking branch 'qatar/master'


* qatar/master:
  fate: add Alias PIX tests

Conflicts:
	tests/fate/image.mak

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

parents 12ab07be 9718c31e

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

tests/fate/image.mak 9 additions, 0 deletions

tests/fate/image.mak
tests/ref/fate/aliaspix-bgr 2 additions, 0 deletions

tests/ref/fate/aliaspix-bgr
tests/ref/fate/aliaspix-gray 2 additions, 0 deletions

tests/ref/fate/aliaspix-gray

with 13 additions and 0 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