Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Sep 2013 13:43:22 +0000 (15:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Sep 2013 13:51:08 +0000 (15:51 +0200)
commit1fb0d961149f7d80738828267668c8e847f0cb66
tree1d0965bf9152816e68c0c6df46ae91afd9bf2b97
parentd195e6e410e4d8220a7751765c71ec111f89597f
parenta454dec19aa6666b555deec431bc42eda391d7b6
Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'

* commit 'a454dec19aa6666b555deec431bc42eda391d7b6':
  pixdesc: fix NV20* descriptors
  h264_sei: check SEI size

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264_sei.c