diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 21:11:25 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 21:11:25 +0200 |
commit | 14d241b19dcde7808de7c3c631886f25f91f2008 (patch) | |
tree | e5df42c7d81fe8b5a88b354b3a0444c1ca2a03ac /doc/protocols.texi | |
parent | 68f48406069e9aff0c01c96671f7c58de166e1f8 (diff) | |
parent | 43fd3dd80ca2d1c2ccf6a7b7632db544c809c690 (diff) | |
download | ffmpeg-14d241b19dcde7808de7c3c631886f25f91f2008.tar.gz |
Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'
* commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690':
h264: drop redundant initialization in init()
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/protocols.texi')
0 files changed, 0 insertions, 0 deletions