Merge commit '84f226a3'
* commit '84f226a3': h264: use the correct SPS during PPS parsing Conflicts: libavcodec/h264_ps.c See: dc35b77bMerged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '84f226a3': h264: use the correct SPS during PPS parsing Conflicts: libavcodec/h264_ps.c See: dc35b77bMerged-by:Michael Niedermayer <michaelni@gmx.at>