Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Dec 2012 13:38:10 +0000 (14:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Dec 2012 13:38:10 +0000 (14:38 +0100)
commit09b4ae8331f8c073792583d1eddf96973f709c89
tree7148f59a17305268b418abbc632b6a4f21936691
parent94ecbe23c52b699a8f2bda1cf71fb4efbf28679a
parent61c6eef5456f2bc8b1dc49a0a759c975551cea29
Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'

* commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29':
  h264: prevent decoding of slice NALs in extradata
  doxy: Clarify what avpriv_set_pts_info does

Conflicts:
libavcodec/h264.c

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