aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rmdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-12 22:06:21 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-12 22:28:54 +0200
commitd5fcca83b915df9536d595a1a44c24294b606836 (patch)
treee414b8d967bf761a6be218d4f16b6796d928d590 /libavformat/rmdec.c
parent885afff01c720cc0a3c52802bd7f82bb81d9e576 (diff)
parentb11acd57326db6c2cc1475dd0bea2a06fbc85aa2 (diff)
downloadffmpeg-d5fcca83b915df9536d595a1a44c24294b606836.tar.gz
Merge commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2'
* commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2': hevc: remove HEVCContext usage from hevc_ps Conflicts: libavcodec/hevc.c libavcodec/hevc_cabac.c libavcodec/hevc_filter.c libavcodec/hevc_mvs.c libavcodec/hevc_ps.c libavcodec/hevc_refs.c libavcodec/hevcpred_template.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/rmdec.c')
0 files changed, 0 insertions, 0 deletions