Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 09:55:51 +0000 (11:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 09:59:16 +0000 (11:59 +0200)
commit0a28a52d53e20e45d8ca8c977984742b15b774f8
treea1cb5ad0491ca2d5a871934249f0ed0f01d068e3
parent75fbe41fc61eb8db693d00a529ba7a31830308e1
parentdd0bfc3a6a310e3e3674ce7742672d689a9a0e93
Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'

* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
  dsicinav: Bound-check the source buffer when needed

Conflicts:
libavcodec/dsicinav.c

See: 47f0beadba9003391d8bfef59b15aa21a5b2d293
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsicinav.c