Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 06:54:54 +0000 (08:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 06:54:54 +0000 (08:54 +0200)
commit7cd13f618c3cf47c21ec8128ed61f16a14c349ef
tree193055d863976a9edf20441d441ee0ab40adc64e
parentbdccfc3fc354632f49721fc435310fb958843b21
parent0d8b943d204bd16fcf2f4a59c742e65a401dd3d0
Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'

* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
  h264_sei: Return meaningful values

Conflicts:
libavcodec/h264_sei.c

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