diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:42:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 13:42:44 +0100 |
| commit | 61635c7a8822d13bc8da69e116f40738be43539a (patch) | |
| tree | 79aacaa9fc966147d4c88d4465034e7eefa5d327 /cmdutils.c | |
| parent | a2740a060b36f6612043fa3128f4eb6197d0ce13 (diff) | |
| parent | 8b00f4df20f4a8ab0656fdaf7d00233a6515a052 (diff) | |
| download | ffmpeg-61635c7a8822d13bc8da69e116f40738be43539a.tar.gz | |
Merge commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052'
* commit '8b00f4df20f4a8ab0656fdaf7d00233a6515a052':
h264: move some neighbour information into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions