Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 23:51:07 +0000 (01:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 23:51:11 +0000 (01:51 +0200)
* cehoyos/master:
  Show subtitle resolution in avcodec_string().

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

Trivial merge