diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-22 01:23:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-22 01:32:55 +0100 |
| commit | 148506c965dde46ca8166c04f398bd8e85f81f3c (patch) | |
| tree | bf9f1f61269584bab9c6d4ad1f8d047d9c3425a9 /libswresample/swresample.c | |
| parent | 70e3fae88d5993b69016c82d4528ad343cc19e3b (diff) | |
| parent | cd975d5658a1cbe99939df75db59d5ae9fbcb4e0 (diff) | |
| download | ffmpeg-148506c965dde46ca8166c04f398bd8e85f81f3c.tar.gz | |
Merge commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0'
* commit 'cd975d5658a1cbe99939df75db59d5ae9fbcb4e0':
hevc: Spin the mv_mpv_mode calls in a stand alone function
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
0 files changed, 0 insertions, 0 deletions