Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 10:08:13 +0000 (11:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 10:37:42 +0000 (11:37 +0100)
commit74a9c92840d3494393938874c1cdd5bdb95cc918
treeb114adeb0e0b49141a7a23ebb9411a0a3bee5ff8
parentfead24141af0ed162b0bebd1764ab147690a02f3
parent4d2bb289318cce3fd1f6fded4468cc26f9d5c55e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: namespace the decode function

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