diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:03:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 23:03:12 +0100 |
| commit | 29f9d82d23ffc4e48c220c68c7041ca581632981 (patch) | |
| tree | 4ea28e802df1b855a415754ad05cd6b5ef0c4b04 /libavdevice/opengl_enc_shaders.h | |
| parent | df38883607d256135082d76f22f4f93051dda690 (diff) | |
| parent | 8633fb47db2ec39eb8bd1bd65302af75a94ff5d0 (diff) | |
| download | ffmpeg-29f9d82d23ffc4e48c220c68c7041ca581632981.tar.gz | |
Merge commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0'
* commit '8633fb47db2ec39eb8bd1bd65302af75a94ff5d0':
rtpdec_hevc: Share the implementation of parsing a=framesize with h264
Conflicts:
libavformat/rtpdec_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/opengl_enc_shaders.h')
0 files changed, 0 insertions, 0 deletions