diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:47:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 17:47:12 +0200 |
| commit | 2d70282254834b276ab5eea44dba694f98551c79 (patch) | |
| tree | 57c8bc8f4c248c001eca910f13c26cee3fcf8437 /libavcodec/ass.c | |
| parent | 95398aa9499bfad3330b47001b7eb086c31b0cd6 (diff) | |
| parent | d754ed41727b1fcbab335b510248a9758a73320c (diff) | |
| download | ffmpeg-2d70282254834b276ab5eea44dba694f98551c79.tar.gz | |
Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'
* commit 'd754ed41727b1fcbab335b510248a9758a73320c':
riffenc: take an AVStream instead of an AVCodecContext
Conflicts:
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass.c')
0 files changed, 0 insertions, 0 deletions