diff options
| author | Michael Niedermayer <[email protected]> | 2014-06-03 18:03:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-06-03 18:03:19 +0200 |
| commit | 40285d265906ea6c1d99cfeba64a5a6c1c9d4bd5 (patch) | |
| tree | eec277297efb6ae6a3d7239a0e8b4fb344d0178f /libavformat/mpeg.c | |
| parent | ab9afcdf0483925b492fc590c383c866e1f1dc31 (diff) | |
| parent | 6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617 (diff) | |
Merge commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617'
* commit '6a0fa4d86f2b3e9060a1153b39fa3bfe36f1b617':
aarch64: remove optional :pg_hi21: for adrp instruction
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/mpeg.c')
0 files changed, 0 insertions, 0 deletions