diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 12:44:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 12:44:09 +0100 |
| commit | 7fd732b75825ff5e3dd54bf56c1ab9b74477c93f (patch) | |
| tree | bcfbc18c4fcf05230286d5c13688bf232870ae18 /ffmpeg_filter.c | |
| parent | 34c58618bef02c5584c93e1d39592a309905204b (diff) | |
| parent | 16163e6bf2d446c06d4dd053c0852074bb50508d (diff) | |
| download | ffmpeg-7fd732b75825ff5e3dd54bf56c1ab9b74477c93f.tar.gz | |
Merge commit '16163e6bf2d446c06d4dd053c0852074bb50508d'
* commit '16163e6bf2d446c06d4dd053c0852074bb50508d':
rtpdec_h264: Fix nal type counting after refactoring
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