diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:20:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:20:37 +0200 |
| commit | 78eaaa857e95fa5542dc008c8ad3664e6ab6801a (patch) | |
| tree | 41bed9cbaefc6147bd6acbb8018e9e1dd33544ca /libavcodec/bintext.c | |
| parent | 0d0d24af0159ff08f396ad04cd63ce5655b1fc60 (diff) | |
| parent | fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45 (diff) | |
| download | ffmpeg-78eaaa857e95fa5542dc008c8ad3664e6ab6801a.tar.gz | |
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
avresample: Introduce AVFrame-based API
Conflicts:
libavresample/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bintext.c')
0 files changed, 0 insertions, 0 deletions