* commit '98cc9efc':
  h264: prevent two matching fields from being both a short/long ref combination

See: 92002db3Merged-by: Michael Niedermayer <michaelni@gmx.at>