aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtspcodes.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-12 16:52:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-12 16:52:49 +0200
commit980aa2ae355d6dc93384d23440ea53c57254a08b (patch)
tree6f03a3363d67891074e6f8cd64fb9fc1bc46c3c4 /libavformat/rtspcodes.h
parent17cbc6457b7a0c38fececc3e0ecff99cc8c96526 (diff)
parent14ca0aa69b5d954ce56d0826ab9f1f70e535c92a (diff)
downloadffmpeg-980aa2ae355d6dc93384d23440ea53c57254a08b.tar.gz
Merge commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a'
* commit '14ca0aa69b5d954ce56d0826ab9f1f70e535c92a': hevc: wait proper position for tmvp Conflicts: libavcodec/hevc_mvs.c See: ed248e7f70d98abe099392e154d1cdd0f15faa3c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtspcodes.h')
0 files changed, 0 insertions, 0 deletions