Merge commit 'c5fca0174db9ed45be821177f49bd9633152704d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 10:36:28 +0000 (12:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 10:36:28 +0000 (12:36 +0200)
commit2e5c8b06491b3713405421e1dcbcdf9bb1e7dfea
tree2e4398236ebcf49b0315791e97ff01e55d89567c
parent5003b8b9c3bacc4e542c923a7766c2ff46e0b1e8
parentc5fca0174db9ed45be821177f49bd9633152704d
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>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h