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

Merge commit '87bd298a' 


* commit '87bd298a':
  DPX parser

Conflicts:
	libavcodec/dpx_parser.c
	libavcodec/version.h

See: 8ec32866
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9aabe667 87bd298a
No related branches found
No related tags found
No related merge requests 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