[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 17 08:13:12 2013 +0200| [21b3563dcbaabc177f6eec4c0ffc77c0981b92bd] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mem: Make av_strdup allocate using av_realloc

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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