diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:38:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 14:38:10 +0100 |
| commit | 09b4ae8331f8c073792583d1eddf96973f709c89 (patch) | |
| tree | 7148f59a17305268b418abbc632b6a4f21936691 /libavfilter/vf_blackdetect.c | |
| parent | 94ecbe23c52b699a8f2bda1cf71fb4efbf28679a (diff) | |
| parent | 61c6eef5456f2bc8b1dc49a0a759c975551cea29 (diff) | |
| download | ffmpeg-09b4ae8331f8c073792583d1eddf96973f709c89.tar.gz | |
Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'
* commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29':
h264: prevent decoding of slice NALs in extradata
doxy: Clarify what avpriv_set_pts_info does
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_blackdetect.c')
0 files changed, 0 insertions, 0 deletions