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

Merge commit '5d045046'


* commit '5d045046':
  idcin: better error handling
  idcin: check for integer overflow when calling av_get_packet()

Conflicts:
	libavformat/idcin.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a0dbe2a5 5d045046
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment