aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/lfg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-24 21:34:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-24 21:34:54 +0200
commit244682dd086233b71e885d2fb1ec0dd3396b94bc (patch)
tree6a314fbc579bad35bb666ee469d28e2b2872e57c /libavutil/lfg.c
parent5c44c2de8045ea0b9787a95053f542b1b3b860d2 (diff)
parent145a8096d53c20da7898539e521e6d4267ab2f09 (diff)
downloadffmpeg-244682dd086233b71e885d2fb1ec0dd3396b94bc.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: log: Only include unistd.h if configure found it ape: create audio stream before reading tags. mov: make a length variable larger. image2: Add "start_number" private option to the demuxer image2: Add "start_number" private option to the muxer avconv: remove a forgotten debugging printf. avconv: use more descriptive names for hardcoded filters. avconv: remove redundant handling of async. doc/filters: fix typo. h264: use asm cabac reader under a generic condition Conflicts: ffmpeg.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lfg.c')
0 files changed, 0 insertions, 0 deletions