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)
commit54d628a580bea7bfcd84461ef6d953c3e09d908a
treec36c29f14b6983d638d72fa7c30bac85aa1664f3
parente5c338ba7abd086b54021da885dc3b451927f4d5
parent6fcfafff8456942172a4b610454175a5d289270b
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Show subtitle resolution in avcodec_string().

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