Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 18:59:36 +0000 (20:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jun 2015 19:11:49 +0000 (21:11 +0200)
commit2e9dcb82e5d54f54befe3c42b4d0bc9a6bd47016
treecca664f41bca8250f1d782a706c92a3c63effd47
parent185e76976e8291d42f82972d0b7e103ef4b2d8cd
parent3e3056f2a020dd77efdf379dbd4c06a65b4a499a
Merge commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a'

* commit '3e3056f2a020dd77efdf379dbd4c06a65b4a499a':
  h264: Allow stream and container cropping at the same time

Conflicts:
libavcodec/h264_slice.c

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