diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 23:56:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-24 23:56:48 +0200 |
| commit | d382170c5daa0da0c92953cb8afc0161e956f429 (patch) | |
| tree | 03251f56e8cb6f2f82ae785e5c6819a90075005b /libavformat/asfcrypt.c | |
| parent | 12e3c1bee487f6961d92ceaa204891f73adc87a6 (diff) | |
| parent | 70feca926b93f339cb58c340550e9a2367263bf7 (diff) | |
| download | ffmpeg-d382170c5daa0da0c92953cb8afc0161e956f429.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: check decoded subtitles encoding.
lavu: fix GET_UTF8 macro.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfcrypt.c')
0 files changed, 0 insertions, 0 deletions