diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 19:37:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 19:37:20 +0200 |
| commit | ede7602cba81fd466b62aa812c2a0d0cd9c7c19d (patch) | |
| tree | 9a1759273847292dc22676753ae639466d57a811 /libavcodec/jpeg2000.c | |
| parent | ac3b01a9c0607961f4540fe62040833870f5deb1 (diff) | |
| parent | 3130416aecc8f3596f993d7768b0001ea2b85e24 (diff) | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add support for changing the channel by the C key
ffplay: cycle through the streams of the current program, and not every stream
ffplay: add null packet after attached pics packet
ffplay: factor out putting null packet into the queue
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.c')
0 files changed, 0 insertions, 0 deletions