Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:21:13 +0000 (04:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:21:13 +0000 (04:21 +0100)
commitff4f2036defbadc60081ba252e093abda5897d6d
tree4458b6baaf4cfcca3ff27ff8785f3aff3fd6d755
parentbb7ad47ddf94511eece7e243402e2cf95cddf1df
parentc63dd3f0a48a9f6389d253597ab51caddc0118db
Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'

* commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db':
  a64multi: check elbg return values

Conflicts:
libavcodec/a64multienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/a64multienc.c