diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:13:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:13:42 +0100 |
| commit | 5227eac5b0408ea077ef7d1ff94ae35748fb012f (patch) | |
| tree | c4ae35bde00ce6c8de0ae629411dee110abd4516 /libavutil/rc4.c | |
| parent | bb40f8f5e22c0c4097a704fdd6e7a66b96f0318d (diff) | |
| parent | 6d56bc9a6d853a33fe53ab63db580c4facaba420 (diff) | |
| download | ffmpeg-5227eac5b0408ea077ef7d1ff94ae35748fb012f.tar.gz | |
Merge commit '6d56bc9a6d853a33fe53ab63db580c4facaba420' into release/2.2
* commit '6d56bc9a6d853a33fe53ab63db580c4facaba420':
lavf: simplify ff_hevc_annexb2mp4_buf
Conflicts:
libavformat/hevc.c
libavformat/hevc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/rc4.c')
0 files changed, 0 insertions, 0 deletions