Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c' | Michael Niedermayer | 2012-12-23 | 1 | -4/+4 |
| | | | | | | | | | | | | | * commit 'b047c68783aa4042b322af7af043b643d5daf09c': 4xm: don't rely on get_buffer() initializing the frame. huffyuv: split encoder and decoder into separate files. lavc: make pkt_{p,d}ts doxy less confusing Conflicts: libavcodec/Makefile libavcodec/huffyuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||||
* | huffyuv: split encoder and decoder into separate files. | Anton Khirnov | 2012-12-23 | 1 | -0/+92 |