diff options
| author | Michael Niedermayer <[email protected]> | 2013-07-05 11:49:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-07-05 11:50:46 +0200 |
| commit | 0e2056056fc8d70046c6e3a83c94c3f1b4ea70a4 (patch) | |
| tree | bac78bdde239f80f3ffbda34dd02d239b6eb2893 /libavformat/tcp.c | |
| parent | cced6f4d58168096f13a4d34555754717979429d (diff) | |
| parent | f6f36ca8ca1b2526d3abff7d7c627322d3bce912 (diff) | |
Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'
* commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912':
indeo: Refactor ff_ivi_dec_huff_desc
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions