diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-21 16:07:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-21 16:07:53 +0100 |
| commit | da7f4c32ab6bf517d4ef51297da46cf459479b22 (patch) | |
| tree | 63d729fabc2501ad6d9dc2c5bdfc241f274307fe /libavcodec/mdct_float.c | |
| parent | 04d23cf1c5f678f5fe0fe0eb5fd92a59c70e8c42 (diff) | |
| parent | 9951907f6fc37a8d41566dbee09f7c15ff587de6 (diff) | |
Merge commit '9951907f6fc37a8d41566dbee09f7c15ff587de6'
* commit '9951907f6fc37a8d41566dbee09f7c15ff587de6':
h264: move redundant_pic_count into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/mdct_float.c')
0 files changed, 0 insertions, 0 deletions