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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 29 11:08:13 2013 +0100| [74a9c92840d3494393938874c1cdd5bdb95cc918] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: namespace the decode function

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

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