diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 13:59:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 14:15:30 +0100 |
| commit | 69a6eddd607a80ed413a380aed51fbac3b9aa7a8 (patch) | |
| tree | d0a18b0f7bfc65167ebfa4271df1a2b3fd6ac698 /libavresample | |
| parent | 086566a557eedc0cf70851b95f1cd7d691d3e41f (diff) | |
| parent | f2960097e42ddf9a356bab6547f87906f6999e0a (diff) | |
| download | ffmpeg-69a6eddd607a80ed413a380aed51fbac3b9aa7a8.tar.gz | |
Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'
* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
bink: fix a check for the first frame.
doc/developer: Drop obsolete MPlayer reference
doc/developer: Add ISC license to list of acceptable licenses
doc/developer: Add web links for all suggested licenses
Conflicts:
doc/developer.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions