diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-27 16:11:02 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-27 17:00:14 +0200 |
| commit | 78c7197ea0e5c53393849a32dd6f49e3b89f7815 (patch) | |
| tree | 3d7a5eeccfa77d746cb82018ffbdef8c94a11959 /libavfilter/vf_histogram.c | |
| parent | 376d8fb2c5742e6718323d6a69479c6ee68dd75b (diff) | |
| parent | 54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b (diff) | |
| download | ffmpeg-78c7197ea0e5c53393849a32dd6f49e3b89f7815.tar.gz | |
Merge commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b'
* commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b':
h264: set mb_aff_frame in frame_start()
h264: move the block starting a new field out of slice_header_parse()
Both commits are merged at the same time in order to prevent a
regression with Ticket #4440 (see 38660128).
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/vf_histogram.c')
0 files changed, 0 insertions, 0 deletions