diff options
| author | Michael Niedermayer <[email protected]> | 2014-07-28 12:36:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-07-28 12:36:28 +0200 |
| commit | 2e5c8b06491b3713405421e1dcbcdf9bb1e7dfea (patch) | |
| tree | 2e4398236ebcf49b0315791e97ff01e55d89567c /libavformat/unix.c | |
| parent | 5003b8b9c3bacc4e542c923a7766c2ff46e0b1e8 (diff) | |
| parent | c5fca0174db9ed45be821177f49bd9633152704d (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavformat/unix.c')
0 files changed, 0 insertions, 0 deletions