diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:39:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:39:30 +0200 |
| commit | 5d5f8b29b4d4976f9f429b73a0bb562db028bfd0 (patch) | |
| tree | 28163098d20fc733748436d7e66d52d58dd8e811 /libavdevice/iec61883.c | |
| parent | 495eee01238b1282c6b61a021ee9fa5f42b6f108 (diff) | |
| parent | f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68 (diff) | |
| download | ffmpeg-5d5f8b29b4d4976f9f429b73a0bb562db028bfd0.tar.gz | |
Merge commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68'
* commit 'f56d8d8dd72b1ab52aa814c5a0fccabf8040ef68':
h264: aarch64: intra prediction optimisations
Conflicts:
libavcodec/h264pred.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavdevice/iec61883.c')
0 files changed, 0 insertions, 0 deletions