falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '11cd727fbd603197cb1e49654fce3352d56f8fd8' 

* commit '11cd727fbd603197cb1e49654fce3352d56f8fd8':
  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>
tags/n2.4
Michael Niedermayer 11 years ago
parent
54ca4dd43b 11cd727fbd
commit
24e81a0a8d
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available