diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:59:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:59:07 +0200 |
| commit | 3fc8500483bef4dcb43b4a1e5fe628e416ca1a0e (patch) | |
| tree | 733e987f3d178a93c4377871e00261600e7eba81 /libavcodec/msmpeg4enc.c | |
| parent | 2ad28840b3fb90d9f000b676853846792e05bd68 (diff) | |
| parent | 268bb88544d9a5256992a9817e60972461359865 (diff) | |
| download | ffmpeg-3fc8500483bef4dcb43b4a1e5fe628e416ca1a0e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
smacker: add a clarification notice about audio decoding
configure: make jack depend on pthreads
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msmpeg4enc.c')
0 files changed, 0 insertions, 0 deletions