diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 00:33:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-10 00:33:57 +0200 |
| commit | 421c116fc498c2564823b96182c5baddcc0629b6 (patch) | |
| tree | 397e7fec16d6d1a53ec2e3de67017678ab02d4c1 /libswscale/Makefile | |
| parent | 849d40dce62d125eb470cb549f98f32b71bb9730 (diff) | |
| parent | cf79f202757b0444f448fe472595ac140d7a3e77 (diff) | |
| download | ffmpeg-421c116fc498c2564823b96182c5baddcc0629b6.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix a typo in amr.c.
Remove an unneeded include of avassert.h from amr.c.
Do not allow writing invalid wav channel layouts by default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/Makefile')
0 files changed, 0 insertions, 0 deletions