diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 19:13:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 19:13:34 +0200 |
| commit | 3ac51145304f9996152a80f5a191ced7b857a252 (patch) | |
| tree | 4dfcddd2c641e53647a105fab3f32eede7173557 /libavcodec/dnxhdenc.c | |
| parent | 6d2df3c00a7899e9c06e3a460d64e4d0ccde0fae (diff) | |
| parent | e63b818dbe6060b606ae10eb184859f8b97d2353 (diff) | |
Merge commit 'e63b818dbe6060b606ae10eb184859f8b97d2353'
* commit 'e63b818dbe6060b606ae10eb184859f8b97d2353':
dv: Properly split decoder and encoder initialization
Conflicts:
libavcodec/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
0 files changed, 0 insertions, 0 deletions