diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:31:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 14:31:59 +0200 |
| commit | 93f80cf2cc506aa597283bf38d670496d594c09f (patch) | |
| tree | dccf8292de7cbecd2341fccb989db1cf313a63ba /cmdutils.h | |
| parent | 204c8798a89665d78d79c77ea5cc13ff1452f2e8 (diff) | |
| parent | 1ab4578c88dc3e1407da15471bd323ba40c3ebbb (diff) | |
| download | ffmpeg-93f80cf2cc506aa597283bf38d670496d594c09f.tar.gz | |
Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1
* commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb':
lavc: Fix assignments in if() when calling ff_af_queue_add
wav: Always seek to an even offset
swscale: Use alpha from the right row in yuva2rgba_c
Prepare for 9.6 Release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
0 files changed, 0 insertions, 0 deletions