Merge commit '11cd727fbd603197cb1e49654fce3352d56f8fd8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:23:14 +0000 (21:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Aug 2014 19:23:14 +0000 (21:23 +0200)
commit24e81a0a8d86e764dfb89cb21e9caa4aff073e1c
tree087d3f24d4603982f1fc13c67162a89db1ebdc45
parent54ca4dd43bdc8658b7304d9309cdb096c8e8a394
parent11cd727fbd603197cb1e49654fce3352d56f8fd8
Merge commit '11cd727fbd603197cb1e49654fce3352d56f8fd8'

* commit '11cd727fbd603197cb1e49654fce3352d56f8fd8':
  vsrc_movie: Adjust a silly typo from b977b287f61fea48ecd6251d54a26334213b7ec6

Conflicts:
libavfilter/src_movie.c

No change, the typo is not part of FFmpeg

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