diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 22:01:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 22:01:24 +0100 |
| commit | adaba6a108aa9641633c529dc7da3f97f6619bc4 (patch) | |
| tree | 5105f781694661e0d0c8c15085416817fa642762 /libavcodec/wma.c | |
| parent | 4a59994e03178878bd22195d4509aea5fd97fc82 (diff) | |
| parent | 4c41a7a1798dd6c60e40f79be12faa98a9347151 (diff) | |
| download | ffmpeg-adaba6a108aa9641633c529dc7da3f97f6619bc4.tar.gz | |
Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'
* commit '4c41a7a1798dd6c60e40f79be12faa98a9347151':
vf_frei0r: fix missing end of line character
Conflicts:
libavfilter/vf_frei0r.c
No change as the token parsing change was not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.c')
0 files changed, 0 insertions, 0 deletions