Merge commit 'c33c1fa8af2b2e82418a06901b6ad17b3d61b73e'
[ffmpeg.git] / libavcodec / bintext.h
2013-08-12 Michael Niedermayerlibavcodec/bintext.h: Fix duplicate words
2011-09-16 Peter RossBinary text decoder