diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 12:47:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 12:48:55 +0100 |
| commit | 46f4b468e2102467aadf5b91e44b8a0607202ee2 (patch) | |
| tree | 44d63ca9623dcdb86b76baa49534978c4fc4c7c8 /libavutil/aes.c | |
| parent | e20f2dc048fd1fccda7ab56fbadd53054439f452 (diff) | |
| parent | cb6f8245aed2c26fe95c30cd68c45983277a945a (diff) | |
| download | ffmpeg-46f4b468e2102467aadf5b91e44b8a0607202ee2.tar.gz | |
Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'
* commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a':
cmdutils: Allow calling filter_codec_opts without a set encoder
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aes.c')
0 files changed, 0 insertions, 0 deletions