diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:44:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:44:38 +0100 |
| commit | 6abd1e901c065280d50adbbf95eb54773870328c (patch) | |
| tree | 69ff8bd6a5d99e25696cf21bdb05a8b3016ffa59 /cmdutils.c | |
| parent | 61635c7a8822d13bc8da69e116f40738be43539a (diff) | |
| parent | 7d8154edd594981e7891d57de91f2260f8a62939 (diff) | |
| download | ffmpeg-6abd1e901c065280d50adbbf95eb54773870328c.tar.gz | |
Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'
* commit '7d8154edd594981e7891d57de91f2260f8a62939':
h264: move intra4x4_pred_mode[_cache] into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions