From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 4 Oct 2013 09:21:50 +0000 (+0200)
Subject: Merge commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740'
X-Git-Tag: android-x86-4.4-r1~798
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8378aae7293575cecad9cccb23226708e2303ccf;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740'

* commit '6a5bfd4d49e7433f6de869ccfe682940dbca8740':
  atrac: Add missing av_cold

See: 852241561d040e0b147b5c866fd4f288324fbe48
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

8378aae7293575cecad9cccb23226708e2303ccf