diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 05:23:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-28 05:26:24 +0100 |
| commit | 296e63efa56f1fb454cafb5c7f54dfb80cbfbab4 (patch) | |
| tree | 03b3e65e5267e1fe5870603ec59999ef3d139fee /ffmpeg_opt.c | |
| parent | 6bd05ed8bb3010322a9285a29e0ea8b0934b63e9 (diff) | |
| parent | 678082b409aca711f9cf991df6b0200116489322 (diff) | |
| download | ffmpeg-296e63efa56f1fb454cafb5c7f54dfb80cbfbab4.tar.gz | |
Merge commit '678082b409aca711f9cf991df6b0200116489322'
* commit '678082b409aca711f9cf991df6b0200116489322':
X-Bitmap decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavcodec/xbmdec.c
See: a0340dfbd78df7639715056937011d2d414aaeed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions