Merge commit 'bcd91f1644b46dd142c5355c8b742b27d9028903'
authorClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 08:24:06 +0000 (10:24 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 08:24:06 +0000 (10:24 +0200)
commit13872d2aa1f454f103e501b91417c44f0f184d53
tree718fb4412a10f0c0ad3435059b0fca174b377dda
parent238733f7417cd290ebac6fa70f3e62ded2c0bb3f
parentbcd91f1644b46dd142c5355c8b742b27d9028903
Merge commit 'bcd91f1644b46dd142c5355c8b742b27d9028903'

* commit 'bcd91f1644b46dd142c5355c8b742b27d9028903':
  h264: move a per-field block from decode_slice_header() to field_start()

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/h264_slice.c