diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 21:08:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 21:08:30 +0100 |
| commit | 75cc29a8a8e68aaa81c549f563521c64ed4e2caf (patch) | |
| tree | 1673822545bb13e5f0ab33bfa5c0a1f0b792aedd /doc/examples/avcodec.c | |
| parent | 76d7676fccee4febb8ddb39f53a5b9a643cb2efd (diff) | |
| parent | cce791b17becc99f47e097adb93f4b4bbd382e7e (diff) | |
| download | ffmpeg-75cc29a8a8e68aaa81c549f563521c64ed4e2caf.tar.gz | |
Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'
* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e':
hpeldsp_template: Merge some declarations and initializations
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/avcodec.c')
0 files changed, 0 insertions, 0 deletions