Commit 24e81a0a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '11cd727f'

* commit '11cd727f':
  vsrc_movie: Adjust a silly typo from b977b287

Conflicts:
	libavfilter/src_movie.c

No change, the typo is not part of FFmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 54ca4dd4 11cd727f
Markdown is supported
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