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

Merge commit '5e83d9ac' 


* commit '5e83d9ac':
  h264: fully support cropping.

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/h264_ps.c
	libavcodec/options_table.h
	libavcodec/version.h

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