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

Merge commit '5da51284'


* commit '5da51284':
  cavs: Add a dependency on h264chroma
  lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs

Conflicts:
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ff9b6074 5da51284
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