Skip to content
Snippets Groups Projects
Commit 2f74b8d0 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '04d8af5f' 


* commit '04d8af5f':
  fate-mpeg4: use TARGET_SAMPLES for resize tests

Conflicts:
	tests/fate/mpeg4.mak

See: c40a1bd2
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents d5a3a20d 04d8af5f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment