projects / ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c33351f edc7e67)
Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Feb 2014 23:37:51 +0000 (00:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Feb 2014 23:37:54 +0000 (00:37 +0100)
commit058a3d65427e48b086011d79efb0b0dd85cd3a79
tree3c138440ecbd0a42cabcabf4e4c57ae9701fca35tree | snapshot
parentc33351f3e75d13803f8e19676304b405711d38eacommit | diff
parentedc7e67669ad5b4519b18d1932baf75c50577db3commit | diff
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/lavd: version bump and APIchanges for uncoded frames.
  tools: add uncoded_frame test program.
  lavf: add uncodedframecrc test muxer.
  lavd/xv: preliminary support of uncoded frame.
  lavd/alsa: preliminary support of uncoded frame.
  lavf: add write_uncoded_frame() API.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg git repo