codecs: handle onReset() for a few encoders am: 5443b57cc5 am: 89f501d046

author Wonsik Kim <wonsik@google.com>

Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)
author Wonsik Kim <wonsik@google.com>
Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)
diff --cc media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp
Simple merge
diff --cc media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h
Simple merge
diff --cc media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp
Simple merge
author	Wonsik Kim <wonsik@google.com>
	Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 16 Feb 2017 01:34:50 +0000 (01:34 +0000)
		1	2
media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h	patch \|	diff1 \|	diff2 \|	blob \| history
media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp	patch \|	diff1 \|	diff2 \|	blob \| history