diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:07:21 -0700 |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2016-08-03 20:07:21 -0700 |
| commit | 7f7cedd7139f18480e3dacd1abcfd94bda01fa17 (patch) | |
| tree | 014f7506d73757e0254209daa54744e8170ca32a /ffmpeg_filter.c | |
| parent | de625312862a99500ce7aa1703b5d783ae66d704 (diff) | |
| parent | 58640fe89ec4f2a3d67c0a2585fca8de34440857 (diff) | |
Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'
* commit '58640fe89ec4f2a3d67c0a2585fca8de34440857':
h264: handle frame recovery in h264_field_start()
Conflicts:
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions