Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'
authorClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 08:24:42 +0000 (10:24 +0200)
committerClément Bœsch <u@pkh.me>
Fri, 29 Jul 2016 08:24:42 +0000 (10:24 +0200)
commitcc0852bee3608cd4b0cadb2ea4b7e58a22aa3c0e
treecc07517ecab0bddc37920011a9a251ec5e3fc760
parent13872d2aa1f454f103e501b91417c44f0f184d53
parent19446dc5fff6a2f5ccd1a73db66e266255a5d768
Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'

* commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768':
  h264: drop unused NAL_FF_IGNORE

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