diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 12:46:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 12:46:13 +0200 |
| commit | 7cdb3b2b79d78b7b3e686b3a53e904b4656d461f (patch) | |
| tree | 385b6b788702258652331c138d1e9717087e4253 /libavformat/mkvtimestamp_v2.c | |
| parent | 135ea609cebb5a5d331a2550caebe161d163c190 (diff) | |
| parent | 6869612f5c7d4d2f20f69a5658328a761deadb1c (diff) | |
| download | ffmpeg-7cdb3b2b79d78b7b3e686b3a53e904b4656d461f.tar.gz | |
Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'
* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
arm: Macroize the test for 'setend' CPU instruction support
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mkvtimestamp_v2.c')
0 files changed, 0 insertions, 0 deletions