summaryrefslogtreecommitdiff
path: root/libavcodec/error_resilience.h
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-17
|\
| * error_resilience: add required headers.Anton Khirnov2013-02-17
* | Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'Michael Niedermayer2013-02-16
|/
* error_resilience: decouple ER from MpegEncContextAnton Khirnov2013-02-15