-
Michael Niedermayer authored
* commit 'b3dc260e': h264: return meaningful values Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
e0b45ca7
* commit 'b3dc260e': h264: return meaningful values Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>