diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 13:51:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-05 13:51:44 +0100 |
| commit | e3c93f1f84a339d40315987963f636222b3ed72d (patch) | |
| tree | b6a01d67f3150598527abb5e3951cabcb06916ad /libavcodec/frame_thread_encoder.h | |
| parent | 5abbeefd5e64ee229eeb226cc7109046f09f14b3 (diff) | |
| parent | e995cf1bccc6e91bbaa6a8771e23fb3ab259c110 (diff) | |
| download | ffmpeg-e3c93f1f84a339d40315987963f636222b3ed72d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/frame_thread_encoder.h')
0 files changed, 0 insertions, 0 deletions