diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:08:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 15:08:51 +0100 |
| commit | 2d1d053c5d2ca59c8c0f35d91404cd899267add1 (patch) | |
| tree | 3414c2c2532b6059a461987498fb94409a8c7fcf /libavutil/arm/float_dsp_init_arm.c | |
| parent | b05d3550407418aea53f2672463a8ebc8f75654e (diff) | |
| parent | c7caed88a03567e8777a606f4bd42f093c6b302c (diff) | |
| download | ffmpeg-2d1d053c5d2ca59c8c0f35d91404cd899267add1.tar.gz | |
Merge commit 'c7caed88a03567e8777a606f4bd42f093c6b302c' into release/2.2
* commit 'c7caed88a03567e8777a606f4bd42f093c6b302c':
h264: Always invoke the get_format() callback
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/float_dsp_init_arm.c')
0 files changed, 0 insertions, 0 deletions