aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mips/amrwbdec_mips.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2016-09-28 13:12:18 -0300
committerJames Almer <jamrial@gmail.com>2016-09-28 13:12:18 -0300
commit6e76c9c45018b9cea383ff1c3f17d08792623509 (patch)
treebcfdbc8086bde9c940976a6144fb9737b31c09ef /libavcodec/mips/amrwbdec_mips.c
parentf013ba475b0dbf71e2804c57e67bf308ae636f2b (diff)
parenta8164323374e86ce5f93759230868c98356833a2 (diff)
downloadffmpeg-6e76c9c45018b9cea383ff1c3f17d08792623509.tar.gz
Merge commit 'a8164323374e86ce5f93759230868c98356833a2'
* commit 'a8164323374e86ce5f93759230868c98356833a2': pixdesc: Add new SMPTE 431, 432, and 2085 color properties Conflicts: libavcodec/options_table.h libavcodec/version.h libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mips/amrwbdec_mips.c')
0 files changed, 0 insertions, 0 deletions