diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:38:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:47:05 +0200 |
| commit | c0f2ad3dbdeada7ba43b0510580467718f1334ca (patch) | |
| tree | 4793efb53ed74106b572634d86f25808277d48d8 /libavcodec/arm | |
| parent | 50b7ce12574df47ac5380b05259f10e6b516fb17 (diff) | |
| parent | 218d6844b37d339ffbf2044ad07d8be7767e2734 (diff) | |
| download | ffmpeg-c0f2ad3dbdeada7ba43b0510580467718f1334ca.tar.gz | |
Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'
* commit '218d6844b37d339ffbf2044ad07d8be7767e2734':
h264dsp: Factorize code into a new function, h264_find_start_code_candidate
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
0 files changed, 0 insertions, 0 deletions