diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 13:58:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 13:58:12 +0100 |
| commit | b6e7041f90daf89b17a10bcd73cd3b42d4e3540a (patch) | |
| tree | f17b0864e29810a2457a86004b99e8fd3a287009 /libavcodec/pcxenc.c | |
| parent | 593f5c0f3c559a558efcb10a955cbac499e1fdbb (diff) | |
| parent | b35e5d985dd12acf9a0aaa52334134edcf35d68e (diff) | |
| download | ffmpeg-b6e7041f90daf89b17a10bcd73cd3b42d4e3540a.tar.gz | |
Merge commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e'
* commit 'b35e5d985dd12acf9a0aaa52334134edcf35d68e':
doc: improve documentation for the asyncts filter first_pts option
asyncts: fix the asyncts behavior when using the first_pts option
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcxenc.c')
0 files changed, 0 insertions, 0 deletions