aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver_config.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-23 21:01:44 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-23 21:01:44 +0100
commit596f81c75b67eb78fee75de32cd5dd0f4eb85430 (patch)
treeac325bd88f90339d335fe9983d9df80191e94314 /ffserver_config.h
parent34a8de866f88186f54da87a8e322c48910659149 (diff)
parentfe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc (diff)
downloadffmpeg-596f81c75b67eb78fee75de32cd5dd0f4eb85430.tar.gz
Merge commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc'
* commit 'fe208ca54b0d3b6bbe1c660d371bb2cc6cf40ffc': rtpdec_hevc: Skip 1 byte (DOND) instead of 2 (DONL) between aggregation units Conflicts: libavformat/rtpdec_hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver_config.h')
0 files changed, 0 insertions, 0 deletions