merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:15:10 +0000 (01:15 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:15:10 +0000 (01:15 +0900)
commit3a4f596e92b894bae6759455e5b8e63124a9c3fd
tree1435ef26bd07af360996121594bb3b9377bee808
parent62de3958c4f50f09113877f8ee2db4acba757223
merge with master
libavcodec/h264_ps.c
libavformat/libavformat.v [changed mode: 0644->0755]
libavformat/mov.c [changed mode: 0644->0755]
packaging/ffmpeg.spec