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)
* 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>

Trivial merge