diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:51:53 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-02 10:59:06 +0200 |
| commit | db395bef7f9a0c8af782835aefb358e56c6bfb46 (patch) | |
| tree | c88f4f21d5470604eeac0096ca7b649446a7de84 /CREDITS | |
| parent | 2ab827389bc17972dfe58b768083593b1f1bf776 (diff) | |
| parent | 80ea66112817c719b476de8f7d8d3b325f4c7dd1 (diff) | |
| download | ffmpeg-streaming-db395bef7f9a0c8af782835aefb358e56c6bfb46.zip ffmpeg-streaming-db395bef7f9a0c8af782835aefb358e56c6bfb46.tar.gz | |
Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'
* commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1':
avcodec: h264: Extract decoder methods
Conflicts:
libavcodec/h264_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions
