Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 10:55:56 +0000 (11:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 10:56:46 +0000 (11:56 +0100)
commitfe540ae6b72a20e84f828b2e37a0a538631b4049
treee8e65bb784d9472beb2fc0678e055d260afd7727
parent7a88b7a9ad7ab5c9bd4b71db6790c59aa1155582
parentf0259a587ee3419dd894873ea617b4c98eeaca1c
Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'

* commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c':
  h264: check buffer size before accessing it

Conflicts:
libavcodec/h264.c

See: ea0ac11e52b9cf5264f3d4eb7543e760c2a5fbb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c