diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 14:42:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 14:51:59 +0200 |
| commit | 8fa695a9e37933f4f943028c0dbcc35b1fb68d28 (patch) | |
| tree | 67046888cef444f9fdf76527f3c63c1d13abb28f /libavcodec/dirac_arith.h | |
| parent | 350f4be12dbc1825f310d230acc431f47ab4bca4 (diff) | |
| parent | 7d585bc94c494f73a390fd38e78500f136e59992 (diff) | |
| download | ffmpeg-8fa695a9e37933f4f943028c0dbcc35b1fb68d28.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Do not automatically map subtitles if the decoder and encoder properties are different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dirac_arith.h')
0 files changed, 0 insertions, 0 deletions