git.osdn.net Git - android-x86/external-ffmpeg.git/commitdiff

author	Michael Niedermayer <michaelni@gmx.at>
	Mon, 15 Jul 2013 21:58:38 +0000 (23:58 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Mon, 15 Jul 2013 22:02:39 +0000 (00:02 +0200)

* commit '5b4eb243bce10a3e8345401a353749e0414c54ca':
mov: Seek back if overreading an individual atom

Conflicts:
libavformat/mov.c
See: 6093960ae35c8d69c559b5604f683c2ea3f279ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>

		1	2
libavformat/mov.c	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

external/ffmpeg

About OSDN

Find Software

Develop Software

Help