ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Jul 28
12:36:28 2014 +0200| [2e5c8b06491b3713405421e1dcbcdf9bb1e7dfea] | committer:
Michael Niedermayer
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]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e5c8b06491b3713405421e1dcbcdf9bb1e7dfea
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
