Merge commit '2ea00e35'
* commit '2ea00e35': h264: do not abuse the context as a temporary storage in get_last_needed_nal() Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment