aboutsummaryrefslogtreecommitdiffstats
path: root/libMpegTPEnc/src/tpenc_asc.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-02-20 16:41:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-20 16:41:27 +0000
commitb3f525e5a771b3b92d01a5b79798c9233c1d66d2 (patch)
tree673869d79ae0f285c9d8acebf3e588eb62b8dd1e /libMpegTPEnc/src/tpenc_asc.cpp
parent5a8db9346c7df1415701251ebda0e33404ab9ad5 (diff)
parentc726622078675cd3c07bde79f61b4dc06852421e (diff)
downloadfdk-aac-b3f525e5a771b3b92d01a5b79798c9233c1d66d2.tar.gz
fdk-aac-b3f525e5a771b3b92d01a5b79798c9233c1d66d2.tar.bz2
fdk-aac-b3f525e5a771b3b92d01a5b79798c9233c1d66d2.zip
[automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s ours am: 10a3289cdd -s ours am: c726622078 -s ours
am skip reason: Change-Id Id04d2590c249cad13da8dd8975d0a12ce96a9597 with SHA-1 a5f0e4af6d is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I53e6e4b91f7c54dc9ee702d7461fe36212c27aa4
Diffstat (limited to 'libMpegTPEnc/src/tpenc_asc.cpp')
0 files changed, 0 insertions, 0 deletions