Merge commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:02:23 +0000 (17:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 16:02:23 +0000 (17:02 +0100)
commit727b202330712eb981eb008b1e7a936d71092f71
tree4072ae70d540b801a44f6964a7a143827bd3c927
parenteba2c2321bc51b0faf5df379e5968ef2aa581cd8
parent2ea00e35e4e0b58f7a306dd55d8f72a21c32c946
Merge commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946'

* commit '2ea00e35e4e0b58f7a306dd55d8f72a21c32c946':
  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>
libavcodec/h264.c