diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-23 22:09:50 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-23 22:09:54 +0200 |
commit | 55179987e7676dcb4df5acda2173185787cb01aa (patch) | |
tree | 46ada0be03c6c9365d50fda0e0daa447d2c158ff /libavformat/aiffenc.c | |
parent | 6b733be755529f2472472d9ed1b2eef3b6398828 (diff) | |
parent | 1f5a3cf688bcaf998bf00e84d2654983b2f4719f (diff) | |
download | ffmpeg-55179987e7676dcb4df5acda2173185787cb01aa.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: move pts calculating code to generic decoder
ffplay: factorize decoder functions to generic decoder
ffplay: handle fullscreen status on resize event
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffenc.c')
0 files changed, 0 insertions, 0 deletions