Merge commit 'ee6280ca12696a67535ce2245c77190edc513794'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 03:50:08 +0000 (04:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 03:51:05 +0000 (04:51 +0100)
* commit 'ee6280ca12696a67535ce2245c77190edc513794':
  h264: parse two additional constraint flags

Conflicts:
libavcodec/h264_ps.c

See: 9091ba9dfa0901bdce8305cf282c747b0f4c942e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_ps.c

Simple merge