Changeset 3788a3c0 in ffmpeg
- Timestamp:
-
Apr 26, 2011, 2:21:15 AM
(14 years ago)
- Author:
- Michael Niedermayer <michaelni@gmx.at>
- Branches:
- master
- Children:
- ff558d7b
- Parents:
- 05815b35 (diff), f80b381b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
- git-author:
- Michael Niedermayer <michaelni@gmx.at> (04/26/11 02:12:43)
- git-committer:
- Michael Niedermayer <michaelni@gmx.at> (04/26/11 02:21:15)
- Message:
-
Merge remote branch 'qatar/master'
- qatar/master:
graphparser: add a NULL check on the argument passed to strstr
setdar: prefer "sar" over "par" in log info message
fade: fix draw_slice() check on fade->factor value
fade: make draw_slice() chroma check against planes 1 and 2
win32: include the correct header in cmdutils.c
ac3: fix memleak in fixed-point encoder
flashsv: Return more meaningful error values.
flashsv: Employ explicit AVCodec struct initializers.
read AVI palette from the end of extradata
cosmetics: K&R coding style and more whitespace for Flash Screen Video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
(No files)
-
