diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 12:59:02 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 13:00:26 +0400 |
| commit | a76390d100ec85f88a7d48ddad476c4a685008f9 (patch) | |
| tree | 7ccbaef8bdecc03a34df517d62466d4f059a5f1b /libavcodec/h264_direct.c | |
| parent | 8d63aaed1efe58d951c312bad01d38277518fa36 (diff) | |
| parent | 6c786765cd5eb794dedd4a0970dfe689b16dfeeb (diff) | |
Merge commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb'
* commit '6c786765cd5eb794dedd4a0970dfe689b16dfeeb':
movenc: Allow chapters to be written in trailer
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
0 files changed, 0 insertions, 0 deletions