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)
* commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768':
  h264: drop unused NAL_FF_IGNORE

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

Simple merge
Simple merge