diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:39:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:42:28 +0200 |
| commit | ac217bda30a79177c8a47713b3db12dc9e9bd45b (patch) | |
| tree | 79dedb63dc984965e81a5718a5a376313d75c7f4 /libavcodec/mpeg12data.h | |
| parent | 314be1933e3a39abd6576184786703701ced4415 (diff) | |
| parent | b2b25b0659fa047da6266d2ce165d43011136b30 (diff) | |
| download | ffmpeg-ac217bda30a79177c8a47713b3db12dc9e9bd45b.tar.gz | |
Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'
* commit 'b2b25b0659fa047da6266d2ce165d43011136b30':
af_asyncts: switch to an AVOptions-based system.
Conflicts:
libavfilter/af_asyncts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12data.h')
0 files changed, 0 insertions, 0 deletions