diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:39:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 19:39:06 +0200 |
| commit | 098a699867e061a0ab549ada6c62b35739e40f55 (patch) | |
| tree | 520b4ea1d587a7ff20df319c8e7bdd1abdf8aad4 /libavcodec/avrndec.c | |
| parent | 9b7cb02319b65596b5ef106a830fd813248fb580 (diff) | |
| parent | 3b2fbe67bd63b00331db2a9b213f6d420418a312 (diff) | |
| download | ffmpeg-098a699867e061a0ab549ada6c62b35739e40f55.tar.gz | |
Merge commit '3b2fbe67bd63b00331db2a9b213f6d420418a312'
* commit '3b2fbe67bd63b00331db2a9b213f6d420418a312':
lavc: properly handle subtitle_header in avcodec_copy_context()
Conflicts:
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avrndec.c')
0 files changed, 0 insertions, 0 deletions