diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 12:32:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 12:32:28 +0100 |
| commit | 34c58618bef02c5584c93e1d39592a309905204b (patch) | |
| tree | 3771fea651230fd920a362c0656b950fc093c8a7 /ffmpeg_filter.c | |
| parent | 621450e786c66b84626f0c7bafcfff6bed330e5d (diff) | |
| parent | a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a (diff) | |
| download | ffmpeg-34c58618bef02c5584c93e1d39592a309905204b.tar.gz | |
Merge commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a'
* commit 'a3cc519d1f43bf93cc29fd53284a2b8aa6189a9a':
rtpdec_h264: Prepare h264_handle_packet_stap_a for sharing with hevc
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions