diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:38:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:38:11 +0100 |
| commit | 7fff5781b6a94fa6f29a1e508f5badbbecf35232 (patch) | |
| tree | fbe0bdabf6d302cf89d24002df7904a8f2dca899 /libavcodec/anm.c | |
| parent | b64077bebe1f29adb2e72af1d9382c35f73ae651 (diff) | |
| parent | e4a7b2177d14678ae240edcabaacfe2b14619b7b (diff) | |
| download | ffmpeg-7fff5781b6a94fa6f29a1e508f5badbbecf35232.tar.gz | |
Merge commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b'
* commit 'e4a7b2177d14678ae240edcabaacfe2b14619b7b':
vf_showinfo: remove its useless init function
AVOptions: fix using named constants with child contexts.
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/anm.c')
0 files changed, 0 insertions, 0 deletions