diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:45:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 16:45:43 +0100 |
| commit | f1edf881ef83de9f8af12fae32cb28f895ae988a (patch) | |
| tree | 198c75632969b62dc23856823599c705848a8dda /libavcodec/bmp_parser.c | |
| parent | cd259cdaa94717f7c6d2a0c87a7ba0171d1f0978 (diff) | |
| parent | c9db8694a83647a9d466ffdbbba0b40da79aef1a (diff) | |
| download | ffmpeg-f1edf881ef83de9f8af12fae32cb28f895ae988a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avisynth: fix setting packet properties
See: 4cb9c2013662b46e8101d6fdf6c69d41668c8b9a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp_parser.c')
0 files changed, 0 insertions, 0 deletions