diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:53:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 02:53:39 +0100 |
| commit | cbd9cc5997ec728a5c92b6cafe57412d5869ec74 (patch) | |
| tree | c6fb052d573ca16eb2e6ebba056730edd811b2da /libavformat/mux.c | |
| parent | 8f33810ed26f09a2cac6781008fa174c62dbf35d (diff) | |
| parent | 6c27aea8116303e9c003ff94bbd604db0f7c08e0 (diff) | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/pan: use extended_data instead of data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
0 files changed, 0 insertions, 0 deletions