diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 18:59:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 19:04:40 +0200 |
| commit | d60f680fa741cda235a361c85ea246939201576f (patch) | |
| tree | 1a761f3e15e1c3c82b593a74d96044938bfbf15f /libavcodec/resample.c | |
| parent | 9153b33a742c4e2a85ff6230aea0e75f5a8b26c2 (diff) | |
| parent | 187cfd3c13a1deb47661486824a5b8f41e158a7a (diff) | |
| download | ffmpeg-d60f680fa741cda235a361c85ea246939201576f.tar.gz | |
Merge commit '187cfd3c13a1deb47661486824a5b8f41e158a7a' into release/0.10
* commit '187cfd3c13a1deb47661486824a5b8f41e158a7a':
eamad: use the bytestream2 API instead of AV_RL
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample.c')
0 files changed, 0 insertions, 0 deletions