diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:53:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-23 14:53:39 +0100 |
| commit | f63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0 (patch) | |
| tree | e9c639f1380d8e5ea67d6e1772024e84e2d5b076 /Changelog | |
| parent | 3e641b4842b8b5f6592991479d19f1a7ce846308 (diff) | |
| parent | 6f270da61b8c9a2dc71f48ae2a21e046d7f15b69 (diff) | |
| download | ffmpeg-f63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libschroedingerenc: do not assert on values from external libraries
Conflicts:
libavcodec/libschroedingerenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Changelog')
0 files changed, 0 insertions, 0 deletions