diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:06:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 16:06:57 +0100 |
| commit | 04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42 (patch) | |
| tree | da717a856506847fcad679c9487714044be1275e /libavfilter/vsink_nullsink.c | |
| parent | 7d23931632ea3af55ec4ddb1e572ff31aa2c1e9a (diff) | |
| parent | a9b201cacf85d710b102010cb4baef97f00ea39b (diff) | |
| download | ffmpeg-04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42.tar.gz | |
Merge commit 'a9b201cacf85d710b102010cb4baef97f00ea39b'
* commit 'a9b201cacf85d710b102010cb4baef97f00ea39b':
h264: move cabac_init_idc into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsink_nullsink.c')
0 files changed, 0 insertions, 0 deletions