diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 15:28:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 15:28:35 +0100 |
| commit | d0b7e832fecab33799bb1fc5e0c032119bc34b33 (patch) | |
| tree | 33340fd771c36265c628169793a790eb6907dd89 /libavcodec/qtrle.c | |
| parent | 8bee8f778ae1f7f5aec699f53c7bfa09ef0907c7 (diff) | |
| parent | eb7018d2fcd4a665a8c2b65e1c73c3fe9f7ca356 (diff) | |
| download | ffmpeg-d0b7e832fecab33799bb1fc5e0c032119bc34b33.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Strip ordinals from mingw generated def files
configure: arm: detect default thumb state of compiler
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qtrle.c')
0 files changed, 0 insertions, 0 deletions