diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 02:54:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 02:54:09 +0200 |
| commit | 45ba9d8545829e9c3df1b57de0b00256d8eddaac (patch) | |
| tree | f0c37254e7988fae6ddf702f99da0cf7dac9a2bf /libavformat/gxf.c | |
| parent | 119cf2a44b124ac5ed749589a78233272f4101a1 (diff) | |
| parent | cba4e6062a02d5bf684e13a770be88aa1fec717e (diff) | |
| download | ffmpeg-45ba9d8545829e9c3df1b57de0b00256d8eddaac.tar.gz | |
Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'
* commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e':
More correct printf format specifiers
Conflicts:
libavcodec/h264_ps.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/gxf.c')
0 files changed, 0 insertions, 0 deletions