summaryrefslogtreecommitdiff
path: root/libswresample/x86/Makefile
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-31 13:19:50 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-01-31 13:19:50 +0000
commit899e19f1776c607c126b291a7e0a614782f18f42 (patch)
tree50792a530d56f35fff93eab04e03c2b8a6b8ad95 /libswresample/x86/Makefile
parent9938697c1c119a675759029ead74b91c529cdf2e (diff)
parent936f0d98f864f9f6bb4f9e5458b78537e146bacd (diff)
downloadffmpeg-899e19f1776c607c126b291a7e0a614782f18f42.tar.gz
Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'
* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd': lavc: Move rtp_payload_size to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libswresample/x86/Makefile')
0 files changed, 0 insertions, 0 deletions