diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-12 10:13:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-12 10:13:56 +0200 |
| commit | c103d5f538d9eadab00f7de756bfc40ba0d2bcc5 (patch) | |
| tree | 9e656c521d97517f65c07cffc552525ed69ba6e3 /libswresample/swresample.c | |
| parent | f18ccb529fb7231f9d40814fbf843d10d9434b43 (diff) | |
| parent | 3ca5df36a50e3ffd3b24734725bf545617a627a8 (diff) | |
| download | ffmpeg-c103d5f538d9eadab00f7de756bfc40ba0d2bcc5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wmall: use AVFrame API properly
Conflicts:
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
0 files changed, 0 insertions, 0 deletions