-
Michael Niedermayer authored
* qatar/master: libschroedingerenc: do not assert on values from external libraries Conflicts: libavcodec/libschroedingerenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
f63ee2aa
* qatar/master:
libschroedingerenc: do not assert on values from external libraries
Conflicts:
libavcodec/libschroedingerenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>