aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/cavsdata.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-21 13:19:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-21 13:22:02 +0100
commite3cc93aacfcbb2111e3520355d414b55b48f9426 (patch)
tree311ed7aca4d2d193d703c0396ce480c9bcbdd9c3 /libavcodec/cavsdata.c
parent2b2b6d1e3ceb1bfe77bc8ae9af763ddae9c352a3 (diff)
parentcbdd1806ead8758949f22b4e4f214b035c78e2b9 (diff)
downloadffmpeg-e3cc93aacfcbb2111e3520355d414b55b48f9426.tar.gz
Merge commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9'
* commit 'cbdd1806ead8758949f22b4e4f214b035c78e2b9': rtpdec_hevc: Implement parsing of aggregated packets Conflicts: libavformat/rtpdec_hevc.c See: b6f577dbb2afde4111a1820435ab2c5afbf78e12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdata.c')
0 files changed, 0 insertions, 0 deletions