diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-13 12:03:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-13 12:03:22 +0100 |
| commit | b13cd2d86763cddd754bab204b0893d7bf7e123b (patch) | |
| tree | 0474a2e55908ee79275f9061887f2a8b8521688f /libavcodec/arm/rv40dsp_init_arm.c | |
| parent | feccf2f6b747e433766464e8a8b215cbe70c5f27 (diff) | |
| parent | d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68 (diff) | |
Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'
* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
lavc: remove disabled FF_API_IDCT cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/arm/rv40dsp_init_arm.c')
0 files changed, 0 insertions, 0 deletions