diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:02:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-04 23:13:51 +0200 |
| commit | 91ff803a748c273044e7a1dc36cdd4cfff4d079a (patch) | |
| tree | bec7a51751e5921dc242e774985b7745afaabaee /libavutil/x86/float_dsp_init.c | |
| parent | 4f4f78ea48d84f32f5ed9447a2f9174020196e89 (diff) | |
| parent | 09c848855a7bf11a9ab4a69971cced260b17817d (diff) | |
| download | ffmpeg-91ff803a748c273044e7a1dc36cdd4cfff4d079a.tar.gz | |
Merge commit '09c848855a7bf11a9ab4a69971cced260b17817d' into release/2.4
* commit '09c848855a7bf11a9ab4a69971cced260b17817d':
h264: Always invoke the get_format() callback
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/float_dsp_init.c')
0 files changed, 0 insertions, 0 deletions