diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-13 02:41:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-13 02:41:18 +0100 |
| commit | d3edc65dd1e5b5d4246fcb8bcd216eb558bab7d4 (patch) | |
| tree | 82e289e25d9899e669f99fe9f739a853c217401d /libavformat/httpauth.c | |
| parent | 150de78d7c9cee65b4095832b25ae353e0d7c7af (diff) | |
| parent | 0517c9e098092709397cc522c59fa63c83cc81be (diff) | |
Merge commit '0517c9e098092709397cc522c59fa63c83cc81be'
* commit '0517c9e098092709397cc522c59fa63c83cc81be':
lavc: remove disabled FF_API_AVCODEC_RESAMPLE cruft
Conflicts:
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/resample.c
libavcodec/resample2.c
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/httpauth.c')
0 files changed, 0 insertions, 0 deletions