diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 13:21:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 13:21:17 +0100 |
| commit | 683ab5fec9942ca2ba2b060dcd0794a362cb2545 (patch) | |
| tree | d5cecf1c7043a356a56d7ffaa942ed602b7d718a /libavformat/subtitles.c | |
| parent | 054e4bab83b789a4f958d6d8f56418e34c279e4b (diff) | |
| parent | f2521563d1a0c3e2a21892f59f3327b82b3db7fc (diff) | |
| download | ffmpeg-683ab5fec9942ca2ba2b060dcd0794a362cb2545.tar.gz | |
Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'
* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
g722dec: Change bits_per_codeword to the right option type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/subtitles.c')
0 files changed, 0 insertions, 0 deletions