-
Michael Niedermayer authored
* commit '0d8b943d': h264_sei: Return meaningful values Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
7cd13f61
* commit '0d8b943d': h264_sei: Return meaningful values Conflicts: libavcodec/h264_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>