Michael Niedermayer 2e5c8b0649 Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d' ...

* commit 'c5fca0174db9ed45be821177f49bd9633152704d':
  lavc: add a property for marking codecs that support frame reordering

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/codec_desc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-07-28 12:36:28 +02:00

99 KiB

Raw Blame History

View Raw