diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 21:13:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 21:13:36 +0100 |
| commit | 06637c92952ce364dbb5add84b7643ed3fc25cac (patch) | |
| tree | 64810d22b141ee2537e6e0ac34a5b0b1aa7308b4 /libavcodec/sanm.c | |
| parent | 3dd04cbcf76b2fe07726c350a5c52270fb9da327 (diff) | |
| parent | 210881110d3e22cca36edeaca118b5e22c998266 (diff) | |
| download | ffmpeg-06637c92952ce364dbb5add84b7643ed3fc25cac.tar.gz | |
Merge commit '210881110d3e22cca36edeaca118b5e22c998266'
* commit '210881110d3e22cca36edeaca118b5e22c998266':
Prepare for 10_alpha2 Release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sanm.c')
0 files changed, 0 insertions, 0 deletions