diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:41:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:41:30 +0100 |
| commit | f038623d534212c79f31434b0b071039c296a08c (patch) | |
| tree | 6832f9f8e680a04412332decada0180d92bd9c08 /libavdevice/fbdev_dec.c | |
| parent | 6aece62b50cc19280213f91007cbf8d63a9f9432 (diff) | |
| parent | 2a75c0b1ca16b5480497de0d4c79ef122406a0b5 (diff) | |
| download | ffmpeg-f038623d534212c79f31434b0b071039c296a08c.tar.gz | |
Merge commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5' into release/2.4
* commit '2a75c0b1ca16b5480497de0d4c79ef122406a0b5':
aacsbr: change order of operation to prevent out of array read
Conflicts:
libavcodec/aacsbr.c
See: c2340831b8e9032716acb0aab4893d3cc500213a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/fbdev_dec.c')
0 files changed, 0 insertions, 0 deletions