aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/msrledec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-04 01:51:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-04 01:51:11 +0200
commit54d628a580bea7bfcd84461ef6d953c3e09d908a (patch)
treec36c29f14b6983d638d72fa7c30bac85aa1664f3 /libavcodec/msrledec.c
parente5c338ba7abd086b54021da885dc3b451927f4d5 (diff)
parent6fcfafff8456942172a4b610454175a5d289270b (diff)
downloadffmpeg-54d628a580bea7bfcd84461ef6d953c3e09d908a.tar.gz
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Show subtitle resolution in avcodec_string(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/msrledec.c')
0 files changed, 0 insertions, 0 deletions