Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 15:07:17 +0000 (16:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 15:07:17 +0000 (16:07 +0100)
commitf4332e959161ef7a58564104e092148ef7409d7d
treef73b9e9d8ba7c701e7634dbfa072309ba3715021
parentcefabaad3e882004ca7a54ea39500ee8e1c6ea93
parentd4f0f2d1e80b76260eb6b9cdde472ac069dfda56
Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'

* commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56':
  lavc: use buf[0] instead of data[0] as the indicator of an allocated frame

Conflicts:
libavcodec/utils.c

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