Skip to content
Snippets Groups Projects
Commit 09b4ae83 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '61c6eef5' 


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

Conflicts:
	libavcodec/h264.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 94ecbe23 61c6eef5
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment