aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ra288.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-27 16:03:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-27 16:03:23 +0100
commit392080cbe52868c00f8dfd4e60639c37a13165f4 (patch)
tree3039ea6b0b267230503f674a0c355cc73049e2c6 /libavcodec/ra288.c
parentf25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1 (diff)
parent167e004e1aca7765686ed95d7cd8ea5064d4f6f6 (diff)
downloadffmpeg-392080cbe52868c00f8dfd4e60639c37a13165f4.tar.gz
Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6': h264: drop any pretense of support for data partitioning Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ra288.c')
0 files changed, 0 insertions, 0 deletions