diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-21 23:18:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-21 23:37:04 +0100 |
| commit | a82f3de053a7c398418b92ee048cf1e5e83d417d (patch) | |
| tree | 6b7d442ddfaf90ff662c966fad8373a003b905e8 /libswresample/swresample_frame.c | |
| parent | ac967ad8724ee860085cd108f822b3f830b89767 (diff) | |
| parent | 312daa15891dc7abb77a404fe927d5ee35c52a71 (diff) | |
| download | ffmpeg-a82f3de053a7c398418b92ee048cf1e5e83d417d.tar.gz | |
Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71'
* commit '312daa15891dc7abb77a404fe927d5ee35c52a71':
vp9: Use the correct upper bound for seg_id
Conflicts:
libavcodec/vp9.h
libavcodec/vp9block.c
Not merged, the value was correct before as far as i can see
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample_frame.c')
0 files changed, 0 insertions, 0 deletions