diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:53:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:56:56 +0100 |
| commit | be26232efa9543106bfc16f45831f69abaf1c552 (patch) | |
| tree | fdbd6091e41c1c50607350304fd43a6146dbc028 /libavcodec/adpcmenc.c | |
| parent | a01fe55077d9627519930ad3e18d79a6682f6132 (diff) | |
| parent | 07acdd651d1e2f4cfa5f610e616e70e323bb69cd (diff) | |
| download | ffmpeg-be26232efa9543106bfc16f45831f69abaf1c552.tar.gz | |
Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'
* commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd':
ivi_common: use proper logging context in ivi_decode_blocks().
ivi_common: make some functions and tables static.
asyncts: ignore min_delta only if first_pts is set
Conflicts:
libavcodec/ivi_common.c
libavcodec/ivi_common.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcmenc.c')
0 files changed, 0 insertions, 0 deletions