diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:09:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:09:51 +0200 |
| commit | d7e8b3d83179b811764660f5613905f7eb726291 (patch) | |
| tree | 96b36ca92dd9dc098387fe0457953dcf10c896c0 /libavutil/sha.c | |
| parent | 44d4488301c69bc026908011a9b6f9df5add3353 (diff) | |
| parent | b89ce54e740500715803c2731bf0008f6fd4bfa8 (diff) | |
| download | ffmpeg-d7e8b3d83179b811764660f5613905f7eb726291.tar.gz | |
Merge remote-tracking branch 'ubitux/lavfi-mixed-short-long'
* ubitux/lavfi-mixed-short-long:
lavfi: restore mixed short/long option support with the new system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/sha.c')
0 files changed, 0 insertions, 0 deletions