diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-02 17:06:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-02 17:06:09 +0200 |
| commit | 1bf22c3a8faf478255712ea95070d948d7614b8d (patch) | |
| tree | c8ba538b63baa8a841f7607ab030aefa3dda3a82 /CREDITS | |
| parent | fb4e434cfb5bf5510bf9ade40a9b63e3a579247e (diff) | |
| parent | f1a75aa033db9e8beceb0b44d797decfc41fd469 (diff) | |
| download | ffmpeg-1bf22c3a8faf478255712ea95070d948d7614b8d.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: remove VideoPicture pix_fmt and use frame pixel format instead
ffplay: only request 4 or 6 channels from SDL, if SDL version is at least 1.2.8
ffplay: add pause audio feature in the middle of a packet
ffplay: remove VideoPicture duration field
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions