diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-03 23:02:32 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-03 23:02:32 +0400 |
| commit | 27744fe439c59182e608c381928817d64bb21d96 (patch) | |
| tree | 62b70361f060197a5f8fc961cea0877c0df443d5 /.gitignore | |
| parent | af58a77f0a9760c97c736bb54ae2884dcf73cf4f (diff) | |
| parent | 1d4a01474d54a4d3bb59dc94d285334f7bcbd889 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpeg12: fixed parsing in some mpeg2 streams
Add SMPTE240M transfer characteristics flag.
mpegts: Some additional HDMV types and reg descriptors for mpegts
motionpixels: Clip YUV values after applying a gradient.
jpeg: handle progressive in second field of interlaced.
ituh263dec: Implement enough of Annex O (scalability) to fix a FPE.
h263: more strictly forbid frame size changes with frame-mt.
h264: additional protection against unsupported size/bitdepth changes.
tta: prevents overflows for 32bit integers in header.
configure: remove malloc_aligned.
vp8: update frame size changes on thread context switches.
snowdsp: explicitily state instruction size.
wmall: fix reconstructing audio with uncoded channels
WMAL cosmetics: fix indentation
gitignore: add Win32 library suffixes
Conflicts:
configure
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/ituh263dec.c
libavcodec/mjpegdec.c
libavcodec/wmalosslessdec.c
libavcodec/x86/snowdsp_mmx.c
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 46d2d67c02..eeb375cf08 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,11 @@ *.a *.o *.d +*.def +*.dll *.exe *.ho +*.lib *.pc *.so *.so.* |