diff options
| author | Michael Niedermayer <[email protected]> | 2013-02-20 11:47:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-02-20 11:47:32 +0100 |
| commit | 98f63e1f34b34e97aa41c94e948c5fc869684287 (patch) | |
| tree | db1a9979f8299eccba7b45e5e1e4b6e5bf16a415 | |
| parent | dd3732634528a51ac8a41528ddd7447073fc049b (diff) | |
| parent | 7ebfb466aec2c4628fcd42a72b29034efcaba4bc (diff) | |
Merge commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc'
* commit '7ebfb466aec2c4628fcd42a72b29034efcaba4bc':
h264: Don't store intra pcm samples in h->mb
get_bits: Return pointer to buffer that is the result of the alignment
Conflicts:
libavcodec/h264_mb_template.c
Merged-by: Michael Niedermayer <[email protected]>
0 files changed, 0 insertions, 0 deletions