aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/nutenc.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-31 14:46:14 -0300
committerJames Almer <jamrial@gmail.com>2017-03-31 14:46:14 -0300
commite2f6e1c4a825cdd95dafc349dcfd4bc05da88fd3 (patch)
tree75612937cd40b35f5943f8d1055266fca479bbf5 /libavformat/nutenc.c
parent5694427dc384cb6f35fc84d87615854d53c2de3a (diff)
parent84f225684cd389747907381122c073aa1c8b6bf1 (diff)
downloadffmpeg-e2f6e1c4a825cdd95dafc349dcfd4bc05da88fd3.tar.gz
Merge commit '84f225684cd389747907381122c073aa1c8b6bf1'
* commit '84f225684cd389747907381122c073aa1c8b6bf1': pthread_frame: properly propagate the hw frame context across frame threads This commit is a noop, see 98f89d615b6490a5b93930c7bfa74c427dedf04e. Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/nutenc.c')
0 files changed, 0 insertions, 0 deletions