Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:19:47 +0000 (14:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:19:56 +0000 (14:19 +0100)
* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
  pthread: make ff_thread_release_buffer idempotent.
  mvi: set framerate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/pthread.c
libavformat/mvi.c

Simple merge
Simple merge