Merge commit '11cd727fbd'

Browse source

* commit '11cd727fbd':
  vsrc_movie: Adjust a silly typo from b977b287f6

Conflicts:
	libavfilter/src_movie.c

No change, the typo is not part of FFmpeg

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

...

This commit is contained in:

Michael Niedermayer 2014-08-21 21:23:14 +02:00

parent 54ca4dd43b 11cd727fbd

commit 24e81a0a8d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available