diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-22 23:36:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-22 23:36:33 +0100 |
| commit | 0269b30fefba3f2a5b9a1ceda67692b4f6c434e5 (patch) | |
| tree | 438a9eca4994b98c942f32915cb63a44658a881f /arch.mak | |
| parent | ef00ef7553fc3b0ab842eccea068ede5eb41d6b0 (diff) | |
| parent | cff480e49d73640c980922626e57c9889bb4b18d (diff) | |
| download | ffmpeg-0269b30fefba3f2a5b9a1ceda67692b4f6c434e5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: Don't call ff_h263dsp_init unconditionally
Conflicts:
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions