Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 12:55:06 +0000 (13:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 13:12:37 +0000 (14:12 +0100)
commit17e47ec8be200d54aa7ef31994e1ba5ea5f32622
tree76487e09972cc3e450aebfcaa6259262e88e3e45
parentfeba750dcd49e8410a4abaf3fbcc0554452206bc
parenta1c5cc429d99216406170eac7e8352860076d3e8
Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'

* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
  lavc: don't set AVFrame.pts to random numbers in decoders.

Conflicts:
libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h261dec.c
libavcodec/ituh263dec.c
libavcodec/mpeg4videodec.c