diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:33:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 04:33:27 +0200 |
| commit | 8543575cc4e270b2d53d00ed0d26140a9badc6bd (patch) | |
| tree | 88c7944f94fb7a60f97550bb2affc528d9f7f05e /libswscale/output.c | |
| parent | 1f5e5d2205df568f86371660b0991ec7087e94e6 (diff) | |
| parent | 78f75b6fa421dd39a715588e9487579f1ce5bada (diff) | |
| download | ffmpeg-8543575cc4e270b2d53d00ed0d26140a9badc6bd.tar.gz | |
Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada'
* commit '78f75b6fa421dd39a715588e9487579f1ce5bada':
wavpack: extract sample rate from the bitstream
configure: support gcc-4.8 instrumentation
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/output.c')
0 files changed, 0 insertions, 0 deletions