diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:32:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:33:51 +0200 |
| commit | 1552b850db5472f2fa023040d207779bca311820 (patch) | |
| tree | d1c75095f6268fbe38a319ba57737bfa7b7be76e /libavcodec/g722dec.c | |
| parent | 47e18e2e03c92a9e344e98c021021248408754db (diff) | |
| parent | b1432e905d462198a8d7834b256848f2b9e4f8e6 (diff) | |
| download | ffmpeg-1552b850db5472f2fa023040d207779bca311820.tar.gz | |
Merge commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6' into release/1.1
* commit 'b1432e905d462198a8d7834b256848f2b9e4f8e6':
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dec.c')
0 files changed, 0 insertions, 0 deletions