Merge commit 'b3dc260e'
* commit 'b3dc260e': h264: return meaningful values Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment
* commit 'b3dc260e': h264: return meaningful values Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>