diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-09 17:06:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-09 17:06:54 +0100 |
| commit | 33c8bb2c6a87e89ed4536ed2ebaa9a1dae2fbfcb (patch) | |
| tree | 3a1045bbd68ddf490c891e37349be2ffc96f89ce /libavfilter/framesync.h | |
| parent | 849f55368c3609d962adf5a729e192de9027b165 (diff) | |
| parent | 883795fb0face00a07349fbd32f4775431a9f30d (diff) | |
Merge commit '883795fb0face00a07349fbd32f4775431a9f30d' into release/2.4
* commit '883795fb0face00a07349fbd32f4775431a9f30d':
h264: restore a block mistakenly removed in e10fd08a
See: 0ecb3075c1c243cfb656d1cbe0b19cdb91bde659
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/framesync.h')
0 files changed, 0 insertions, 0 deletions