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

Merge commit '75644335'


* commit '75644335':
  lavc: Move start code finding to utils.c

Conflicts:
	configure
	libavcodec/mpegvideo.c
	libavcodec/utils.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 795b911b 75644335
No related branches found
No related tags found
No related merge requests found
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