Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Jul 2013 20:50:46 +0000 (22:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Jul 2013 20:50:51 +0000 (22:50 +0200)
commit1af921196fbc7e2ddd043c56054bdbafc15a85f6
tree7f2deb54585d54ad0405c45181eadbf274a60478
parentfd84b6fd3389ffe3f1841e58438f60f114742771
parent9375879d57022ea4c9d6e822e94b3579e6a743c5
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Show max bitrate for mpeg2 video streams in avcodec_string().
  Allow native compilation on the iPhone.

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