diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-22 13:25:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-22 13:25:53 +0100 |
| commit | 98256622a66ebda8f07bb725419c35bb8aa7e01b (patch) | |
| tree | 76f39fe2fbf9c91a5fbb8a55251e36ebf55121a8 /libavcodec/avcodec.h | |
| parent | 3f72dbe4620716113754d06b7ffd558e56d1585f (diff) | |
| parent | aef5150719f03ce87e67c17d2006e24d8961aa17 (diff) | |
| download | ffmpeg-98256622a66ebda8f07bb725419c35bb8aa7e01b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flac: only set channel layout if not previously set or on channel count change
prepare 9_beta3 release
Conflicts:
RELEASE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
0 files changed, 0 insertions, 0 deletions