diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 11:24:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-20 11:24:11 +0100 |
| commit | 17ebef2fc8094a235c0f30ce247c77659ea86539 (patch) | |
| tree | e5e435fe4269c33888e1f55fc09b32e787e3479e /libavcodec/sh4 | |
| parent | db8403d04afc025278f611d43a91429bbfa44026 (diff) | |
| parent | 2c328a907978b61949fd20f7c991803174337855 (diff) | |
| download | ffmpeg-17ebef2fc8094a235c0f30ce247c77659ea86539.tar.gz | |
Merge commit '2c328a907978b61949fd20f7c991803174337855'
* commit '2c328a907978b61949fd20f7c991803174337855':
pixdesc: add a function for counting planes in a pixel format.
avplay: remove the -debug option.
Revert "asfenc: return error on negative timestamp"
Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sh4')
0 files changed, 0 insertions, 0 deletions