diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 12:43:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-22 12:46:19 +0100 |
| commit | 5410a5dc660858920d58a5f09daba264f370f81c (patch) | |
| tree | 6d53029cca96abaafad84c01ac3124647dc3b696 /libavformat/file_open.c | |
| parent | 6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd (diff) | |
| parent | 7398e0516f7fdf98e74e5ce8966ac02c28aba754 (diff) | |
| download | ffmpeg-5410a5dc660858920d58a5f09daba264f370f81c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hevc: move DSP declarations from hevc.h into hevcdsp.h
Conflicts:
libavcodec/hevc.h
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/file_open.c')
0 files changed, 0 insertions, 0 deletions