Merge commit '9929b356'
* commit '9929b356': pthread_frame: simplify the code by using new AVPacket API Conflicts: libavcodec/pthread_frame.c Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment