diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:29:42 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:29:46 +0100 |
commit | d078d57fb769e83c00c402f2f34978c1cd50dce7 (patch) | |
tree | 35172878fd5d228325ff31169bf8ac67cf5053a8 /ffplay.c | |
parent | 010311d67337419b218f0834b019821b08552127 (diff) | |
parent | c9b19ac8928c6c9b7f25c3988177204f110d5e0e (diff) | |
download | ffmpeg-d078d57fb769e83c00c402f2f34978c1cd50dce7.tar.gz |
Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e'
* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
examples/transcode_aac: fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions