OSDN Git Service

Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 12:26:50 +0000 (13:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 12:27:04 +0000 (13:27 +0100)
commitcbee7ff0b7dfefab7f9a5d8639e493ab90c0a0cb
treef556a557a72b5c403ab13db74fa62092616bd4a4
parentfc1d7811ef4afa6387d1d0e30c06cc8c89517ca6
parentdfe224f377be3e45758c69d881ca7874b82d647a
Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'

* commit 'dfe224f377be3e45758c69d881ca7874b82d647a':
  aarch64: get_cabac inline asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aarch64/cabac.h
libavcodec/cabac.h
libavcodec/cabac_functions.h