diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 12:37:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 12:38:20 +0100 |
| commit | 22af79a9c88f8bfaa8c4130c8f58c5bff20e1a1f (patch) | |
| tree | 1a56136338c010c748cb9a084e82f987b3badd3b /libpostproc/postprocres.rc | |
| parent | 7d63f10c37cd9327c39ae4e3e7ec389c08b87390 (diff) | |
| parent | b97f427fb56bdbf7de8e2d4b72d01114aa6eceda (diff) | |
| download | ffmpeg-22af79a9c88f8bfaa8c4130c8f58c5bff20e1a1f.tar.gz | |
Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'
* commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda':
lavf: Explicitly convert types at function pointer assignment
Conflicts:
libavformat/avio.c
libavformat/aviobuf.c
libavformat/swfenc.c
See: a76a2ffe9d7773d59bb1bc228a6660e23672c490 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocres.rc')
0 files changed, 0 insertions, 0 deletions