diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:17:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:17:05 +0200 |
| commit | 019ff7a0c37a25068c99b7b72cc9650a2a47863e (patch) | |
| tree | 6af3c8f8c77fec2140bbf01e5f19a59a6ceb9646 /libswscale/swscale_unscaled.c | |
| parent | c40a1bd253f673d821a5df2a7a863a1837446123 (diff) | |
| parent | cf83c0173917a44b89a25ea2b435429bbf9ee767 (diff) | |
| download | ffmpeg-019ff7a0c37a25068c99b7b72cc9650a2a47863e.tar.gz | |
Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'
* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
avplay: Always free find_stream_info options
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions