Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 20:01:45 +0000 (22:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Aug 2014 20:01:45 +0000 (22:01 +0200)
commit570397c7311554f47d36574107e3d27cd53ec406
treedcfe42903c3fd2b0b5a9b4c18bc1bed311dc5e13
parent9c41b59423bbb86685c05bcf3ef9d4a7efb54f34
parente87f5e4e5f2e2e36b0b7826d708cda7049877af0
Merge commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0'

* commit 'e87f5e4e5f2e2e36b0b7826d708cda7049877af0':
  h264: fully check cropping amount from sps

Conflicts:
libavcodec/h264_slice.c

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