aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dv_tablegen.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-02 11:50:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-02 11:50:30 +0200
commit951a3655048095afbddf5e9f78ac8498636e2479 (patch)
treeb06d5244c254cffc9b5e35dd5f109f347b88a3c5 /libavcodec/dv_tablegen.h
parentd1fa6718952c4937f82653abe54bedb57555143a (diff)
parent8ad3267ce3a1522a181946288049cc848cc9e351 (diff)
downloadffmpeg-951a3655048095afbddf5e9f78ac8498636e2479.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: oggdec: do not fall back on binary search in the generic code. Conflicts: libavformat/oggdec.c tests/ref/seek/lavf-ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv_tablegen.h')
0 files changed, 0 insertions, 0 deletions