diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-21 21:55:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-21 21:55:55 +0200 |
| commit | 1986380df2caaa663f63d0a3b9f0413a3d862757 (patch) | |
| tree | cc9f90b9625c734bfa50bdc4c2603ef6bdc190e4 /libavcodec/libfaac.c | |
| parent | df3850db4958c44e8e4d5aa0fece71c03a51372b (diff) | |
| parent | 86824c1dcb3eaffc2b143de452e8082dc3c59822 (diff) | |
| download | ffmpeg-1986380df2caaa663f63d0a3b9f0413a3d862757.tar.gz | |
Merge branch 'master' into oldabi
* master:
ffplay: do not init SDL audio if -an is specified.
Fix zero-length gnu_printf format string warning.
A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfaac.c')
0 files changed, 0 insertions, 0 deletions