Applying: avcodec/dolby_e: set constant frame_size
Applying: avformat/s337m: Split read_packet/get_packet
Applying: avformat/s337m: Consider container bit resolution
Applying: avformat/s337m: New ff_s337m_probe()
Applying: avformat/wavdec: s337m support
Applying: avformat/wavdec.c: Reindent after last commit
Applying: avformat/wavdec: fix s337m/spdif probing beyond data_end
Applying: avformat/wavdec: Test s337m
Applying: avformat: Add probe_stream option
Using index info to reconstruct a base tree...
M	libavformat/avformat.h
M	libavformat/version.h
Falling back to patching base and 3-way merge...
Auto-merging libavformat/version.h
CONFLICT (content): Merge conflict in libavformat/version.h
Auto-merging libavformat/avformat.h
Patch failed at 0009 avformat: Add probe_stream option
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run git am --continue.
If you prefer to skip this patch, run git am --skip instead.
To restore the original branch and stop patching, run git am --abort.