diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:00:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:00:40 +0200 |
| commit | ce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7 (patch) | |
| tree | f98e03798d7884acbc4ea935943f35332fa9a8d4 /libavfilter/vsink_nullsink.c | |
| parent | 918c5ea4d3702a9eebf4794e75507c4d5bc9cba2 (diff) | |
| parent | 243e8443cd9e83c887e3f5edf09a169e7783d14e (diff) | |
| download | ffmpeg-ce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7.tar.gz | |
Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'
* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
alac: Reject rice_limit 0 if compression is used
Conflicts:
libavcodec/alac.c
See: 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsink_nullsink.c')
0 files changed, 0 insertions, 0 deletions