Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2014-03-24 |
| | | | | | | | | | | | * qatar/master: h264: Split h264 slice decoding from nal decoding Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | h264: Split h264 slice decoding from nal decoding | Luca Barbato | 2014-03-23 |