[FFmpeg-cvslog] Merge commit 'd4f0f2d1e80b76260eb6b9cdde472ac069dfda56'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 16:07:17 2013 +0100| [f4332e959161ef7a58564104e092148ef7409d7d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4332e959161ef7a58564104e092148ef7409d7d
---