diff options
| author | Michael Niedermayer <[email protected]> | 2014-07-08 14:44:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-07-08 14:44:12 +0200 |
| commit | 1f935c3d0b8ca8659974afc02ebdf058dd99cd9c (patch) | |
| tree | 664caa74714de97934cc1937d3d215baf9a8cf8a /libavformat/jacosubenc.c | |
| parent | 70b423e1484f178c40f04b6040349a08aff31f96 (diff) | |
| parent | 79fce1ec8abd017593c003917fc123f7119a78d6 (diff) | |
Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
arm: Avoid using the 'setend' instruction on ARMv7 and newer
Conflicts:
libavcodec/arm/h264dsp_init_arm.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/jacosubenc.c')
0 files changed, 0 insertions, 0 deletions