diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 20:59:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-04 20:59:36 +0200 |
| commit | 84a6abd95420f6552c30b11ab5585fdb306269ba (patch) | |
| tree | b3c381308d192bd3d4210c6bafee61fce91f37f2 /libavformat/crypto.c | |
| parent | 82b1516a85ad21b5455dcfef6fe49d1189565c33 (diff) | |
| parent | 1bf6cb85bebe639c836cdbb4498ea5bc252a7c21 (diff) | |
| download | ffmpeg-84a6abd95420f6552c30b11ab5585fdb306269ba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
applehttp: fix variant discard logic
h263dec: Fix asserts broken by the elimination of FF_COMMON_FRAME.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/crypto.c')
0 files changed, 0 insertions, 0 deletions