diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:39:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 21:39:05 +0100 |
| commit | 1537d0b432d8cad62b6c8af1960674ac452be7ac (patch) | |
| tree | 533644aa37f8da86b6d718ab61206ddf7244c1c4 /libavcodec/celp_math.c | |
| parent | 61d0a6dd9554ecd705518d38d531363cdabab7d3 (diff) | |
| parent | 604c9b1196c70d79bbbc1f23e75f6a8253a74da3 (diff) | |
| download | ffmpeg-1537d0b432d8cad62b6c8af1960674ac452be7ac.tar.gz | |
Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'
* commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3':
rtsp: move the CONFIG_ macros to the beginning of the check
Conflicts:
libavformat/rtsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/celp_math.c')
0 files changed, 0 insertions, 0 deletions