diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-19 18:43:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-19 18:50:11 +0200 |
| commit | 580e81fca5781291950774b18965cc7322f77cb2 (patch) | |
| tree | 398aa4126677aef21691a4c86cbffe6af0824abd /libswresample/options.c | |
| parent | c18a3b3e8ef438c8cd18969f8d87fd7c2201cf32 (diff) | |
| parent | d456baafb68cd80c0f537f1d843076e4dd853558 (diff) | |
| download | ffmpeg-580e81fca5781291950774b18965cc7322f77cb2.tar.gz | |
Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'
* commit 'd456baafb68cd80c0f537f1d843076e4dd853558':
vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()
Conflicts:
libavcodec/vc1dec.c
See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/options.c')
0 files changed, 0 insertions, 0 deletions