Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'qatar/master' | Michael Niedermayer | 2013-11-08 |
|\ | | | | | | | | | | | | | * qatar/master: h263dsp: K&R formatting cosmetics Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
| * | h263dsp: K&R formatting cosmetics | Diego Biurrun | 2013-11-08 |
| | | | | | | | | Also remove array element numbering comments. | ||
* | | Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6' | Michael Niedermayer | 2013-11-08 |
|/ | | | | | | | | | | | | * commit '0338c396987c82b41d322630ea9712fe5f9561d6': dsputil: Split off H.263 bits into their own H263DSPContext Conflicts: configure libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at> | ||
* | dsputil: Split off H.263 bits into their own H263DSPContext | Diego Biurrun | 2013-11-08 |