diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-11 14:28:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-11 14:28:19 +0200 |
| commit | ee2a43798c2a8e3f78806da4cfd41d390c39e115 (patch) | |
| tree | 72ddd487952b8014317f8449b9994d85ab74ee83 /libavformat/rtpdec_xiph.c | |
| parent | bad101ab8a54dd36d569daef35f8e583500bbf49 (diff) | |
| parent | 676856204b84dfaffe329dce8502e834a0dbdb19 (diff) | |
Merge commit '676856204b84dfaffe329dce8502e834a0dbdb19'
* commit '676856204b84dfaffe329dce8502e834a0dbdb19':
DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride
Conflicts:
libavcodec/dnxhdenc.h
libavcodec/x86/dnxhdenc_init.c
See: cb11b9e89e152ed4db22e5ad0349b63fac02101e
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtpdec_xiph.c')
0 files changed, 0 insertions, 0 deletions