[FFmpeg-cvslog] Merge commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  8 17:08:12 2014 +0100| [4df9d9ca4f5a4e6397c34d7d6e8193549f99bd7c] | committer: Michael Niedermayer

Merge commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c'

* commit 'b141c7b37eb52aca41ac83738f159b63b9c09d5c':
  h264: give numbers to nalus

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

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