diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 11:54:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-11 11:56:37 +0200 |
| commit | 673a2b3818032ccf98f7846e33f54f7b89a41401 (patch) | |
| tree | eb2c6806bdd73f06bd84c719240674d0a0d42b41 /libavfilter/fifo.c | |
| parent | f351afb5f9dedc33260b8811223dc39c81bbcec3 (diff) | |
| parent | 1493b237bd3f9707319ac58d315ce45312900c10 (diff) | |
| download | ffmpeg-673a2b3818032ccf98f7846e33f54f7b89a41401.tar.gz | |
Merge commit '1493b237bd3f9707319ac58d315ce45312900c10'
* commit '1493b237bd3f9707319ac58d315ce45312900c10':
hevc: Replace nal type chek with equivalent IS_IRAP macro
Conflicts:
libavcodec/hevc.c
See: e2760de60514b949c0a5584d797d933f711f5b14
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/fifo.c')
0 files changed, 0 insertions, 0 deletions