diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 20:48:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 20:48:53 +0200 |
| commit | ca80c65726dba7b82e7745b3c3ed1d251ca19f39 (patch) | |
| tree | 22a8aa2fcda3a26ff6b2e551f5c16522cb39d964 /libavformat/rtpenc_chain.c | |
| parent | adba796eb4a5373d781e093988f9aa0c3418c6b6 (diff) | |
| parent | 65b8b6c476454d201348737527a1d9471f689278 (diff) | |
| download | ffmpeg-ca80c65726dba7b82e7745b3c3ed1d251ca19f39.tar.gz | |
Merge commit '65b8b6c476454d201348737527a1d9471f689278'
* commit '65b8b6c476454d201348737527a1d9471f689278':
hevc_filter: drop redundant checks
Conflicts:
libavcodec/hevc_filter.c
No change as the removed checks where not in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_chain.c')
0 files changed, 0 insertions, 0 deletions