diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-08 02:16:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-08 02:27:27 +0100 |
| commit | 5794e9fce22a4d3dffda536a220ca9483a2d87da (patch) | |
| tree | 9cd8048ad384e3568814fadeb1c81e7632a950ec /libavformat/httpauth.c | |
| parent | 45854df9a5220bdde400a447f63f61618b89dde2 (diff) | |
| parent | 5fdbfcb5b793f5849c496214668094a8ec99fa07 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dcadsp: split lfe_dir cases
Conflicts:
libavcodec/arm/dcadsp_init_arm.c
See: 45854df9a5220bdde400a447f63f61618b89dde2
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/httpauth.c')
0 files changed, 0 insertions, 0 deletions