diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:36:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:37:19 +0200 |
| commit | f01e3c5d000d264b2935e186594a37a3c00f9465 (patch) | |
| tree | e5d126e20c4eae7084ec809aa320a173683ee250 /libavcodec/hap.h | |
| parent | e3ec2cde2c394af6c9b64bccd39bc206a88a4e58 (diff) | |
| parent | 43dd004747fa697396b47d034a80e069facbea09 (diff) | |
| download | ffmpeg-f01e3c5d000d264b2935e186594a37a3c00f9465.tar.gz | |
Merge commit '43dd004747fa697396b47d034a80e069facbea09'
* commit '43dd004747fa697396b47d034a80e069facbea09':
hap: Move some per-stream setup into decoder init rather than per-frame
Conflicts:
libavcodec/hapdec.c
See: 6074956fa1d2617ac602e49931b06df0a751370e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hap.h')
0 files changed, 0 insertions, 0 deletions