[FFmpeg-cvslog] Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 24 15:43:22 2013 +0200| [1fb0d961149f7d80738828267668c8e847f0cb66] | committer: Michael Niedermayer

Merge commit 'a454dec19aa6666b555deec431bc42eda391d7b6'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1fb0d961149f7d80738828267668c8e847f0cb66
---