Update back for git master

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Changelog: add back the <next> placeholder for new changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/utils: avformat_find_stream_info fix a crash in case of oom

fixes ticket #2767

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>