diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:26:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:26:42 +0100 |
| commit | 2bedcbf82274c08ad137257ed6d81962cf3a9ffd (patch) | |
| tree | 412d41d8672b0459afdde5b6128ac083f8b066df /libavformat/icoenc.c | |
| parent | a51b192f3b8f89a1bafba629655df55348b14195 (diff) | |
| parent | b651c9139e1ab222d5aab9151dcd7d6e40e49885 (diff) | |
| download | ffmpeg-2bedcbf82274c08ad137257ed6d81962cf3a9ffd.tar.gz | |
Merge commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885'
* commit 'b651c9139e1ab222d5aab9151dcd7d6e40e49885':
rtpdec_mpa_robust: Move .enc_name to the start of the struct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/icoenc.c')
0 files changed, 0 insertions, 0 deletions